doctor-admin-components 1.0.14-beta.43 → 1.0.14-beta.45

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
   "version1": "1.0.11",
-  "version": "1.0.14-beta.43",
+  "version": "1.0.14-beta.45",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

package/packages/src/api/biz/bizContract.js

@@ -20,11 +20,28 @@ export function queryPurchaseContracts(saleContractId) {
 // 查询合同的提单指令列表
 export function getContractBlList(contractId) {
   return request({
-    url: "/biz/contract/blList/" + contractId,
+    url: "/biz/contract/bli/list/" + contractId,
     method: "get",
   });
 }
 
+// 查询合同的提单详情
+export function getContractBliDetail(contractId) {
+  return request({
+    url: "/biz/contract/bli/" + contractId,
+    method: "get",
+  });
+}
+
+// 修改合同bli
+export function updateContractBli(data) {
+  return request({
+    url: "/biz/contract/bli/addOrEdit",
+    method: "put",
+    data: data,
+  });
+}
+
 // 合同追踪列表
 export function listContractTrace(query) {
   return request({

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

@@ -618,7 +618,7 @@ export default {
     handleTemplate(command) {
       if (command == 'EXCEL') {
         this.download(
-          'biz/contract/downBill',
+          'biz/contract/bli/downBill',
           {
             contractId: this.billData.contractId,
             templateType: command
@@ -628,7 +628,7 @@ export default {
       }
       if (command == 'PDF') {
         this.download(
-          'biz/contract/downBill',
+          'biz/contract/bli/downBill',
           {
             contractId: this.billData.contractId,
             templateType: command

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

@@ -283,12 +283,11 @@
 </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, changeBizStatus, getSecondNotifyInfo } from '../../../api/biz/bizContract'
+import { getBizContract, getContractBliDetail, updateContractBli, getSecondNotifyInfo } from '../../../api/biz/bizContract'
 import FileUpload from '../../../components/FileUpload/s3.vue'
 
 export default {
@@ -372,11 +371,12 @@ export default {
     this.getSecondNotifyInfo();
   },
   methods: {
-    async handleEdit(contractId, dealId) {
+    async handleEdit(contractId, buyerCompanyId) {
+      this.form.buyerCompanyId = buyerCompanyId
       const loading = this.openLoading()
       try {
         // 等待异步方法完成
-        await this.getDealRecord(dealId)
+        await this.getBliDetail(contractId)
         await this.getContract(contractId)
         // 异步操作完成后设置open为true
         this.open = true
@@ -547,13 +547,15 @@ export default {
       }
       this.resetForm('form')
     },
-    getDealRecord(dealId) {
+    getBliDetail(contractId) {
       // 将整个方法体封装在返回的Promise中
+      const buyerCompanyId = this.form.buyerCompanyId
       return new Promise((resolve, reject) => {
         this.reset()
-        getBizDealRecord(dealId)
+        getContractBliDetail(contractId)
           .then((response) => {
-            this.form = response.data
+            this.form = {...this.form, ...response.data, buyerCompanyId, contractId} 
+            console.log("getContractBliDetail -- this.form:", this.form)
             if (this.form.buyerCompanyBillGoods) {
               this.form.buyerCompanyBillGoods = JSON.parse(this.form.buyerCompanyBillGoods)
             } else {
@@ -566,7 +568,7 @@ export default {
             this.getContractCompanyList(this.form.buyerCompanyId)
             this.getCompanyBillGoods(this.form.buyerCompanyId)
 
-            this.form.dealRecordDetailList.map((item) => {
+            this.form?.dealRecordDetailList?.map((item) => {
               if (item.imageList) {
                 item.askCover = item.imageList.toString()
               }
@@ -588,16 +590,14 @@ export default {
     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)
-            deal.blConfirmFlag = this.confirmFlag
-            updateBizDealRecord(deal).then((response) => {
-              this.open = false
-              this.$modal.msgSuccess('Save Success')
-              this.$emit('edit')
-            })
-          }
+          var deal = JSON.parse(JSON.stringify(this.form))
+          deal.buyerCompanyBillGoods = JSON.stringify(deal.buyerCompanyBillGoods)
+          deal.blConfirmFlag = this.confirmFlag
+          updateContractBli(deal).then((response) => {
+            this.open = false
+            this.$modal.msgSuccess('Save Success')
+            this.$emit('edit')
+          })
         }
       })
     },

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

@@ -246,13 +246,14 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确认上传</el-button>
+        <!-- <el-button type="primary" @click="submitForm">确认上传</el-button>
         <el-button
           v-if="type == 'deposit'"
           type="primary"
           @click="uploadAndGenerate"
           >上传并生成收付款</el-button
-        >
+        > -->
+        <el-button type="primary" @click="submitForm">上传并发起审核</el-button>
       </div>
       <el-dialog
         title="系统计算金额和发票金额不一致"
@@ -385,6 +386,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           console.log('type', this.type);
+          // deposit 定金； finally尾款
           if (this.type == "finally") {
             if(comfirmClickFlag) {
               if(this.form.fixedInvoiceList[0].amount && this.purchaseBalanceMoney && this.form.fixedInvoiceList[0].amount != this.purchaseBalanceMoney) {
@@ -421,6 +423,7 @@ export default {
     },
     /** 展示按钮操作 */
     handleUpload(row, type, shipmentId) {
+      // deposit 定金； finally尾款
       console.log('row:', row)
       this.reset();
       this.type = type;