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

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="saleContract && saleContract.submitFlag">
+    <div v-if="billData && billData.submitFlag">
       <div class="info" id="printPdf" v-if="!printModel">
         <el-form :model="form" ref="form" size="mini" :rules="rules">
           <div v-if="form.shipperFlag">
@@ -8,39 +8,29 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item :label="$t('contract.company') + ':'">
-                  {{
-                  form.shipperCompanyName
-                  }}
+                  {{ form.shipperCompanyName }}
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('contract.taxId') + ':'">
-                  {{
-                  form.shipperTaxNumber
-                  }}
+                  {{ form.shipperTaxNumber }}
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('contract.address') + ':'">
-                  {{
-                  form.shipperAddress
-                  }}
+                  {{ form.shipperAddress }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
                 <el-form-item :label="$t('contract.contact') + ':'">
-                  {{
-                  form.shipperContact
-                  }}
+                  {{ form.shipperContact }}
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('contract.phoneNumber') + ':'">
-                  {{
-                  form.shipperPhoneNumber
-                  }}
+                  {{ form.shipperPhoneNumber }}
                 </el-form-item>
               </el-col>
             </el-row>
@@ -49,9 +39,7 @@
                 <el-row>
                   <el-col :span="20">
                     <div style="white-space: pre-line !important">
-                      {{
-                      form.shipperEmail
-                      }}
+                      {{ form.shipperEmail }}
                     </div>
                   </el-col>
                 </el-row>
@@ -61,63 +49,44 @@
           </div>
           <el-row>
             <el-col :span="22">
-              <div class="sub-title mb20">{{ $t('contract.consigneeInfo') }}</div>
+              <span class="sub-title mb20">{{ $t('contract.consigneeInfo') }}</span>
+              <span v-if="billData.blConfirmFlag == '2'" style="font-size: 16px; color: red; font-weight: bold; padding-left: 10px"> 已作废 </span>
             </el-col>
-            <el-col :span="2">
+            <el-col v-if="billData.blConfirmFlag != '2'" :span="2">
               <el-button type="text" @click="editBill">
-                {{
-                $t("contractDetail.edit")
-                }}
+                {{ $t('contractDetail.edit') }}
               </el-button>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.company') +':'">
-                {{
-                this.form.deliveryCompany
-                ? this.form.deliveryCompany.companyEnglishName
-                : ""
-                }}
+              <el-form-item :label="$t('contract.company') + ':'">
+                {{ this.form.deliveryCompany ? this.form.deliveryCompany.companyEnglishName : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.taxId') +':'">
-                {{
-                this.form.deliveryCompany
-                ? this.form.deliveryCompany.taxNumber
-                : ""
-                }}
+              <el-form-item :label="$t('contract.taxId') + ':'">
+                {{ this.form.deliveryCompany ? this.form.deliveryCompany.taxNumber : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.address') +':'">
-                {{
-                this.form.deliveryCompany
-                ? this.form.deliveryCompany.address
-                : ""
-                }}
+              <el-form-item :label="$t('contract.address') + ':'">
+                {{ this.form.deliveryCompany ? this.form.deliveryCompany.address : '' }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.contact') +':'">
-                {{
-                this.form.deliveryCompany
-                ? this.form.deliveryCompany.contact
-                : ""
-                }}
+              <el-form-item :label="$t('contract.contact') + ':'">
+                {{ this.form.deliveryCompany ? this.form.deliveryCompany.contact : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.phoneNumber') +':'">
+              <el-form-item :label="$t('contract.phoneNumber') + ':'">
                 {{
-                this.form.deliveryCompany &&
-                this.form.deliveryCompany.phoneNumber &&
-                this.form.deliveryCompany.phoneNumber.length > 0
-                ? this.form.deliveryCompany.phoneNumber.join("/")
-                : ""
+                  this.form.deliveryCompany && this.form.deliveryCompany.phoneNumber && this.form.deliveryCompany.phoneNumber.length > 0
+                    ? this.form.deliveryCompany.phoneNumber.join('/')
+                    : ''
                 }}
               </el-form-item>
             </el-col>
@@ -125,43 +94,29 @@
           <el-row>
             <el-col :span="isMobile ? 24 : 8">
               <el-form-item label="GST NUMBER:">
-                {{
-                this.form.deliveryCompany ?
-                this.form.deliveryCompany.gstNumber
-                : ''
-                }}
+                {{ this.form.deliveryCompany ? this.form.deliveryCompany.gstNumber : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="isMobile ? 24 : 8">
               <el-form-item label="PAN NO.:">
-                {{
-                this.form.deliveryCompany ?
-                this.form.deliveryCompany.panNo
-                : ''
-                }}
+                {{ this.form.deliveryCompany ? this.form.deliveryCompany.panNo : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="isMobile ? 24 : 8">
               <el-form-item label="IEC CODE:">
-                {{
-                this.form.deliveryCompany ?
-                this.form.deliveryCompany.iecCode
-                : ''
-                }}
+                {{ this.form.deliveryCompany ? this.form.deliveryCompany.iecCode : '' }}
               </el-form-item>
-            </el-col>
-          </el-row>email
+            </el-col> </el-row
+          >email
           <el-row>
-            <el-form-item :label="$t('contract.email') +':'">
+            <el-form-item :label="$t('contract.email') + ':'">
               <el-row>
                 <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.join("\n")
-                    : ""
+                      this.form.deliveryCompany && this.form.deliveryCompany.email && this.form.deliveryCompany.email.length > 0
+                        ? this.form.deliveryCompany.email.join('\n')
+                        : ''
                     }}
                   </div>
                 </el-col>
@@ -173,52 +128,34 @@
           <div class="sub-title mb20">{{ $t('contract.firstNotifier') }}</div>
           <el-row>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.company') +':'">
-                {{
-                this.form.notifierCompany
-                ? this.form.notifierCompany.companyEnglishName
-                : ""
-                }}
+              <el-form-item :label="$t('contract.company') + ':'">
+                {{ this.form.notifierCompany ? this.form.notifierCompany.companyEnglishName : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.taxId') +':'">
-                {{
-                this.form.notifierCompany
-                ? this.form.notifierCompany.taxNumber
-                : ""
-                }}
+              <el-form-item :label="$t('contract.taxId') + ':'">
+                {{ this.form.notifierCompany ? this.form.notifierCompany.taxNumber : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.address') +':'">
-                {{
-                this.form.notifierCompany
-                ? this.form.notifierCompany.address
-                : ""
-                }}
+              <el-form-item :label="$t('contract.address') + ':'">
+                {{ this.form.notifierCompany ? this.form.notifierCompany.address : '' }}
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.contact') +':'">
-                {{
-                this.form.notifierCompany
-                ? this.form.notifierCompany.contact
-                : ""
-                }}
+              <el-form-item :label="$t('contract.contact') + ':'">
+                {{ this.form.notifierCompany ? this.form.notifierCompany.contact : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('contract.phoneNumber') +':'">
+              <el-form-item :label="$t('contract.phoneNumber') + ':'">
                 {{
-                this.form.notifierCompany &&
-                this.form.notifierCompany.phoneNumber &&
-                this.form.notifierCompany.phoneNumber.length > 0
-                ? this.form.notifierCompany.phoneNumber.join("/")
-                : ""
+                  this.form.notifierCompany && this.form.notifierCompany.phoneNumber && this.form.notifierCompany.phoneNumber.length > 0
+                    ? this.form.notifierCompany.phoneNumber.join('/')
+                    : ''
                 }}
               </el-form-item>
             </el-col>
@@ -227,43 +164,29 @@
           <el-row>
             <el-col :span="isMobile ? 24 : 8">
               <el-form-item label="GST NUMBER:">
-                {{
-                this.form.notifierCompany ?
-                this.form.notifierCompany.gstNumber
-                : ''
-                }}
+                {{ this.form.notifierCompany ? this.form.notifierCompany.gstNumber : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="isMobile ? 24 : 8">
               <el-form-item label="PAN NO.:">
-                {{
-                this.form.notifierCompany ?
-                this.form.notifierCompany.panNo
-                : ''
-                }}
+                {{ this.form.notifierCompany ? this.form.notifierCompany.panNo : '' }}
               </el-form-item>
             </el-col>
             <el-col :span="isMobile ? 24 : 8">
               <el-form-item label="IEC CODE:">
-                {{
-                this.form.notifierCompany ?
-                this.form.notifierCompany.iecCode
-                : ''
-                }}
+                {{ this.form.notifierCompany ? this.form.notifierCompany.iecCode : '' }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-form-item :label="$t('contract.email') +':'">
+            <el-form-item :label="$t('contract.email') + ':'">
               <el-row>
                 <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.join("\n")
-                    : ""
+                      this.form.notifierCompany && this.form.notifierCompany.email && this.form.notifierCompany.email.length > 0
+                        ? this.form.notifierCompany.email.join('\n')
+                        : ''
                     }}
                   </div>
                 </el-col>
@@ -275,23 +198,17 @@
           <el-row>
             <el-col :span="8">
               <el-form-item :label="$t('contract.company') + ':'">
-                {{
-                "TTYY INTERNATIONAL LIMITED"
-                }}
+                {{ 'TTYY INTERNATIONAL LIMITED' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('contract.taxId') + ':'">
-                {{
-                "73855725-000-23-0"
-                }}
+                {{ '73855725-000-23-0' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('contract.address') + ':'">
-                {{
-                "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-col>
           </el-row>
@@ -299,43 +216,27 @@
           <el-row>
             <el-col :span="8">
               <el-form-item :label="$t('contract.contact') + ':'">
-                {{
-                "Ms. Zhou"
-                }}
+                {{ 'Ms. Zhou' }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('contract.phoneNumber') + ':'">
-                {{
-                "0085221267435"
-                }}
+                {{ '00-852 53816912' }}
               </el-form-item>
             </el-col>
             <el-col :span="8"></el-col>
           </el-row>
 
           <el-row>
-            <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-row>
           <el-divider></el-divider>
           <div class="sub-title mb20">{{ $t('contract.otherInfo') }}</div>
 
           <el-row>
-            <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="3">
-                <div
-                  style="
-                    height: 26px;
-                    margin-top: -1px;
-                    text-align: center;
-                    line-height: 28px;
-                    font-size: 14px;
-                  "
-                >{{ $t('contract.option') + " " + (index + 1) }}</div>
+                <div style="height: 26px; margin-top: -1px; text-align: center; line-height: 28px; font-size: 14px">{{ $t('contract.option') + ' ' + (index + 1) }}</div>
               </el-col>
               <el-col :span="15">
                 <el-form-item :label="$t('contract.product') + ':'">{{ buyCompanyBillGood.goodsName }}</el-form-item>
@@ -346,25 +247,23 @@
             </el-row>
           </el-row>
 
-          <el-form-item :label="$t('contractDetail.destination') + ':'">{{ contract.destination }}</el-form-item>
+          <el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contractDetail.destination') + ':'">{{
+            contract.destination
+          }}</el-form-item>
+          <el-form-item v-else :label="'EXW Address' + ':'">{{ contract.exw }}</el-form-item>
+
+          <el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contract.terminal') + ':'">{{
+            form.terminal
+          }}</el-form-item>
 
-          <el-form-item :label="$t('contract.terminal') + ':'">{{ form.terminal }}</el-form-item>
-          
           <el-form-item :label="$t('contract.shippingMarks') + ':'">{{ form.shippingMark }}</el-form-item>
 
           <el-form-item :label="$t('contract.remark') + ':'" prop="blRemark">
-            <div
-              style="white-space: pre-line !important"
-            >{{ "\n" + (form && form.blRemark ? form.blRemark : '') }}</div>
+            <div style="white-space: pre-line !important">{{ '\n' + (form && form.blRemark ? form.blRemark : '') }}</div>
           </el-form-item>
           <el-form-item :label="$t('contract.attachments') + ':'" prop="billPictures">
             <div v-for="(item, i) in form.billPictures" :key="i" class="file-download-link mr10">
-              <el-link
-                :href="item.generateUrl"
-                type="primary"
-                target="_blank"
-                underline
-              >{{ item.fileName || '下载文件' }}</el-link>
+              <el-link :href="item.generateUrl" type="primary" target="_blank" underline>{{ item.fileName || '下载文件' }}</el-link>
             </div>
           </el-form-item>
         </el-form>
@@ -387,26 +286,9 @@
       <div style="text-align: center; margin-top: 50px">
         <svg-icon icon-class="un-submit" style="height: 100px; width: 100px" />
       </div>
-      <div
-        style="
-          text-align: center;
-          margin-top: 20px;
-          font-weight: bold;
-          font-size: 25px;
-        "
-      >The buyer has not provided the required Bill of Lading information.</div>
-      <div
-        style="
-          margin-left: 50px;
-          margin-right: 50px;
-          color: grey;
-          font-size: 25px;
-          font-weight: bold;
-          text-align: center;
-        "
-      >
-        Once the buyer submits the Bill of Lading information, you will be able
-        to view it at this location.
+      <div style="text-align: center; margin-top: 20px; font-weight: bold; font-size: 25px">The buyer has not provided the required Bill of Lading information.</div>
+      <div style="margin-left: 50px; margin-right: 50px; color: grey; font-size: 25px; font-weight: bold; text-align: center">
+        Once the buyer submits the Bill of Lading information, you will be able to view it at this location.
       </div>
     </div>
 
@@ -415,34 +297,44 @@
 </template>
 
 <script>
-import {
-  getBizDealRecordByAskId,
-  updateBizDealRecord,
-} from '../../../api/biz/bizDealRecord';
-import { exportPdf } from '../../../utils/pdf';
-import { listBizContractCompany } from '../../../api/biz/bizContractCompany';
-import BillPdf from './billPdf.vue';
-import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods';
-import EditBill from './editBill.vue';
-import { getSaleContractInfo } from '../../../api/biz/bizContract';
+// import { getBizDealRecordByAskId, updateBizDealRecord } from '../../../api/biz/bizDealRecord'
+import { exportPdf } from '../../../utils/pdf'
+import { listBizContractCompany } from '../../../api/biz/bizContractCompany'
+import BillPdf from './billPdf.vue'
+import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods'
+import EditBill from './editBill.vue'
+// import { getSaleContractInfo } from '../../../api/biz/bizContract'
 
 export default {
   name: 'BillInfo',
   props: {
     contract: {
       type: Object,
-      default: null,
+      default: null
     },
     channel: {
       type: String,
-      default: '',
+      default: ''
     },
+    // 提单指令数据
+    billData: {
+      type: Object,
+      default: null
+    }
   },
   components: { BillPdf, EditBill },
+  watch: {
+    billData: {
+      handler(val) {
+        this.getDealRecord(this.contract.askId)
+      },
+      immediate: true
+    }
+  },
   data() {
     return {
       //
-      saleContract: null,
+      // saleContract: null,
       // 遮罩层
       loading: true,
       // 弹出层标题
@@ -455,9 +347,9 @@ export default {
         buyerCompanyBillGoods: [
           {
             goodsName: '',
-            hsCode: '',
-          },
-        ],
+            hsCode: ''
+          }
+        ]
       },
       printModel: false,
       //
@@ -474,135 +366,113 @@ export default {
         shippingMark: [{ required: true, trigger: 'blur' }],
         deliveryCompanyId: [{ required: true, trigger: 'blur' }],
         notifierCompanyId: [{ required: true, trigger: 'blur' }],
-        goodsName: [{ required: true, trigger: 'blur' }],
+        goodsName: [{ required: true, trigger: 'blur' }]
       },
-      isMobile: document.body.clientWidth <= 768,
-    };
+      isMobile: document.body.clientWidth <= 768
+    }
   },
   created() {
-    const { contractId, printModel } = this.$route.query;
-    this.contractId = contractId;
-    this.getDealRecord(this.contract.askId);
+    const { contractId, printModel } = this.$route.query
+    this.contractId = contractId
+    this.getDealRecord(this.contract.askId)
     if (printModel == 1) {
-      this.printModel = true;
+      this.printModel = true
     }
-    this.getSaleContractInfo(this.contract.dealId);
+    // this.getSaleContractInfo(this.contract.dealId)
   },
   methods: {
-    getSaleContractInfo(dealId) {
-      getSaleContractInfo(dealId).then((res) => {
-        this.saleContract = res.data;
-      });
-    },
+    // getSaleContractInfo(dealId) {
+    //   getSaleContractInfo(dealId).then((res) => {
+    //     this.saleContract = res.data
+    //   })
+    // },
     edit() {
-      this.getDealRecord(this.contract.askId);
+      // this.getDealRecord(this.contract.askId)
+      // 通知外层刷新数据
+      this.$emit('refresh')
     },
     editBill() {
-      this.$refs.editBill.handleEdit(
-        this.contract.contractId,
-        this.form.dealId
-      );
+      this.$refs.editBill.handleEdit(this.billData.contractId, this.form.dealId)
     },
     //子公司更新
     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 billGood = this.billGoodsList.find((i) => i.goodsName == val);
-      this.form.buyerCompanyBillGoods[index].hsCode = billGood.hsCode;
+      const billGood = this.billGoodsList.find((i) => i.goodsName == val)
+      this.form.buyerCompanyBillGoods[index].hsCode = billGood.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') {
-        this.form.deliveryCompany = this.deliveryCompanyList.filter(
-          (item) => item.contractCompanyId == val
-        )[0];
+        this.form.deliveryCompany = this.deliveryCompanyList.filter((item) => item.contractCompanyId == val)[0]
       }
       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]
       }
     },
     //获取收货人公司与通知人公司
     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')
 
-        const defaultDeliveryCompany = this.deliveryCompanyList.find(
-          (item) => item.defaultFlag
-        );
+        const defaultDeliveryCompany = this.deliveryCompanyList.find((item) => item.defaultFlag)
 
-        const notifierDeliveryCompany = this.notifierCompanyList.find(
-          (item) => item.defaultFlag
-        );
+        const notifierDeliveryCompany = this.notifierCompanyList.find((item) => item.defaultFlag)
         //成交没收货人公司取默认 否则取收货人公司信息
         if (!this.form.deliveryCompanyId && defaultDeliveryCompany) {
-          this.form.deliveryCompanyId =
-            defaultDeliveryCompany.contractCompanyId;
-          this.form.deliveryCompany = defaultDeliveryCompany;
+          this.form.deliveryCompanyId = defaultDeliveryCompany.contractCompanyId
+          this.$set(this.form, 'deliveryCompany', defaultDeliveryCompany)
         } else {
-          const deliveryCompany = contractCompanyList.find(
-            (item) => item.contractCompanyId == this.form.deliveryCompanyId
-          );
-          this.$set(this.form, 'deliveryCompany', deliveryCompany);
+          const deliveryCompany = contractCompanyList.find((item) => item.contractCompanyId == this.form.deliveryCompanyId)
+          this.$set(this.form, 'deliveryCompany', deliveryCompany)
         }
 
         //成交没通知人公司取默认 否则取通知人公司信息
         if (!this.form.notifierCompanyId && notifierDeliveryCompany) {
-          this.form.notifierCompanyId =
-            notifierDeliveryCompany.contractCompanyId;
-          this.form.notifierCompany = notifierDeliveryCompany;
+          this.form.notifierCompanyId = notifierDeliveryCompany.contractCompanyId
+          this.$set(this.form, 'notifierCompany', notifierDeliveryCompany)
         } else {
-          const notifierCompany = contractCompanyList.find(
-            (item) => item.contractCompanyId == this.form.notifierCompanyId
-          );
-          this.$set(this.form, 'notifierCompany', notifierCompany);
+          const notifierCompany = contractCompanyList.find((item) => item.contractCompanyId == this.form.notifierCompanyId)
+          this.$set(this.form, 'notifierCompany', notifierCompany)
         }
-      });
+      })
     },
     // 表单重置
     reset() {
@@ -677,64 +547,63 @@ export default {
         notifierCompanyId: null,
         shippingMark: null,
         blRemark: null,
-        buyerCompanyBillGoods: null,
-      };
-      this.resetForm('form');
+        buyerCompanyBillGoods: null
+      }
+      this.resetForm('form')
     },
     getDealRecord(askId) {
-      this.loading = false;
-      this.reset();
-      getBizDealRecordByAskId(askId).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.form = this.billData
+      // this.loading = false
+      // this.reset()
+      // getBizDealRecordByAskId(askId).then((response) => {
+      // this.form = response.data
+      if (this.form.buyerCompanyBillGoods) {
+        if (typeof this.form.buyerCompanyBillGoods === 'string') {
+          this.form.buyerCompanyBillGoods = JSON.parse(this.form.buyerCompanyBillGoods)
         }
-
-        this.getContractCompanyList(this.form.buyerCompanyId);
-        this.getCompanyBillGoods(this.form.buyerCompanyId);
-        this.form.dealRecordDetailList.map((item) => {
-          if (item.imageList) {
-            item.askCover = item.imageList.toString();
-          }
-        });
-        this.loading = true;
-      });
+      } 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.loading = true
+      // })
     },
     /** 提交按钮 */
     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)
             updateDealRecord(deal).then((response) => {
-              this.$modal.msgSuccess('保存成功');
-            });
+              this.$modal.msgSuccess('保存成功')
+            })
           }
         }
-      });
+      })
     },
     //设置打印model为true
     setPrintModel(val) {
-      this.printModel = val;
-      return Promise.resolve();
+      this.printModel = val
+      return Promise.resolve()
     },
     /** 下载 */
     handleExportPdf() {
       this.setPrintModel(true)
         .then(() => {
-          exportPdf('.billPdf', 'bill');
+          exportPdf('.billPdf', 'bill')
         })
         .then(() => {
-          this.printModel = false;
-        });
+          this.printModel = false
+        })
     },
 
     //导出按钮
@@ -743,35 +612,25 @@ export default {
         this.download(
           'biz/contract/downBill',
           {
-            contractId: this.contract.contractId,
-            templateType: command,
+            contractId: this.billData.contractId,
+            templateType: command
           },
-          `${
-            'BLI-' +
-            this.contract.contractNo +
-            '_' +
-            this.parseTime(new Date(), '{y}{m}{d}')
-          }.xlsx`
-        );
+          `${'BLI-' + this.billData.contractNo + '_' + this.parseTime(new Date(), '{y}{m}{d}')}.xlsx`
+        )
       }
       if (command == 'PDF') {
         this.download(
           'biz/contract/downBill',
           {
-            contractId: this.contract.contractId,
-            templateType: command,
+            contractId: this.billData.contractId,
+            templateType: command
           },
-          `${
-            'BLI-' +
-            this.contract.contractNo +
-            '_' +
-            this.parseTime(new Date(), '{y}{m}{d}')
-          }.pdf`
-        );
+          `${'BLI-' + this.billData.contractNo + '_' + this.parseTime(new Date(), '{y}{m}{d}')}.pdf`
+        )
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .info {