doctor-admin-components 1.0.14-beta.22 → 1.0.14-beta.23

package/package.json

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

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

@@ -1130,3 +1130,13 @@ export function editReferenceNo(data) {
     data: data,
   });
 }
+
+
+// 获取第二通知人
+export function getSecondNotifyInfo(query) {
+  return request({
+    url: "/biz/contract/getSecondNotifyInfo",
+    method: "get",
+    params: query,
+  });
+}

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

@@ -155,4 +155,33 @@ export function getDraft(contractId) {
       contractId
     }
   })
-}
+}
+
+
+
+// 保存草稿
+export function containerEditBatch(data) {
+  return request({
+    url: '/biz/container/editBatch',
+    method: 'put',
+    data
+  })
+}
+
+
+// 保存草稿
+export function deductionRecords(data) {
+  return request({
+    url: `biz/shipment/deposit/deduction/record/${data.shipmentId}`,
+    method: 'get',
+    data:{}
+  })
+}
+// 更新 eta更新时间
+export function refreshUpdateTime(data) {
+  return request({
+    url: '/biz/shipment/refreshUpdateTime',
+    method: 'put',
+    data: data
+  })
+}

package/packages/src/views/biz/bizFileInfo/contract.vue

@@ -1540,6 +1540,12 @@ export default {
       this.contractId = contractId;
       this.getContractFileInfo(contractId);
       this.queryParams.linkId = contractId;
+      if(this.$route.query.deductionRecordsShipmentId) {
+        const timer = setTimeout(() => {
+          this.$refs.shipmentPurchaseAmount.handleShow(this.$route.query.deductionRecordsShipmentId);
+          clearTimeout(timer);
+        }, 1000)
+      }
     }
   },
   mounted() { },

package/packages/src/views/biz/bizShipment/add.vue

@@ -50,17 +50,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="ETA" prop="eta" label-width="100">
-              <el-date-picker
-                style="width: 75%"
-                clearable
-                size="small"
-                v-model="form.eta"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择预计到港日期"
-              ></el-date-picker>
-            </el-form-item>
+              <el-form-item label="ETA" prop="eta" label-width="100">
+                <div style="display: flex; flex-direction: row; align-items: center">
+                  <el-date-picker
+                    style="width: 75%"
+                    clearable
+                    size="small"
+                    v-model="form.eta"
+                    type="date"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="请选择预计到港日期"
+                  ></el-date-picker>
+                  <el-button type="text" @click="refreshUpdateTime">更新</el-button>
+                </div>
+              </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实际到港日" prop="actualArrivalDate" label-width="90px">
@@ -455,7 +458,7 @@ import {
   updateWithContainer,
   updateWithContainerAndInvoice,
   saveDraft,
-  getDraft
+  getDraft, refreshUpdateTime
 } from '../../../api/biz/bizShipment'
 import { generateFinalInvoiceByShipmentId } from '../../../api/biz/bizInvoice'
 import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
@@ -1317,6 +1320,17 @@ export default {
           this.isDraft = false
         }
       }
+    },
+    refreshUpdateTime() {
+      if (this.form.shipmentId) {
+        const loading = this.openLoading()
+        refreshUpdateTime(this.form.shipmentId).then((res) => {
+          loading.close()
+          this.$modal.msgSuccess('更新成功')
+        }).catch(() => {
+          loading.close();
+        })
+      }
     }
   }
 }

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

@@ -198,17 +198,17 @@
           <el-row>
             <el-col :span="8">
               <el-form-item :label="$t('contract.company') + ':'">
-                {{ 'TTYY INTERNATIONAL LIMITED' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.companyName : ""}}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('contract.taxId') + ':'">
-                {{ '73855725-000-23-0' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.taxNumber : "" }}
               </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' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.address : "" }}
               </el-form-item>
             </el-col>
           </el-row>
@@ -216,19 +216,19 @@
           <el-row>
             <el-col :span="8">
               <el-form-item :label="$t('contract.contact') + ':'">
-                {{ 'Ms. Zhou' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.contactPerson : "" }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('contract.phoneNumber') + ':'">
-                {{ '00-852 53816912' }}
+                {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.phoneNumber : "" }}
               </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') + ':'">{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.email : "" }}</el-form-item>
           </el-row>
           <el-divider></el-divider>
           <div class="sub-title mb20">{{ $t('contract.otherInfo') }}</div>
@@ -303,6 +303,7 @@ import { listBizContractCompany } from '../../../api/biz/bizContractCompany'
 import BillPdf from './billPdf.vue'
 import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods'
 import EditBill from './editBill.vue'
+import { getSecondNotifyInfo } from '../../../api/biz/bizContract'
 // import { getSaleContractInfo } from '../../../api/biz/bizContract'
 
 export default {
@@ -368,7 +369,8 @@ export default {
         notifierCompanyId: [{ required: true, trigger: 'blur' }],
         goodsName: [{ required: true, trigger: 'blur' }]
       },
-      isMobile: document.body.clientWidth <= 768
+      isMobile: document.body.clientWidth <= 768,
+      secondNotifyInfoInfo: null
     }
   },
   created() {
@@ -378,6 +380,7 @@ export default {
     if (printModel == 1) {
       this.printModel = true
     }
+    this.getSecondNotifyInfo();
     // this.getSaleContractInfo(this.contract.dealId)
   },
   methods: {
@@ -436,6 +439,11 @@ export default {
         }
       })
     },
+    getSecondNotifyInfo() {
+      getSecondNotifyInfo().then((res) => {
+        this.secondNotifyInfoInfo = res.data;
+      })
+    },
     //更改收货人或者通知人公司时 相应显示变更
     changeSubCompany(val, type) {
       if (type == 'delivery') {

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

@@ -0,0 +1,67 @@
+<!--
+ * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @Date: 2024-08-19 15:46:00
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-08-20 13:41:47
+ * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+       <div v-if="list.length">
+         <div class="bold" style="margin-bottom:10px">历史修正记录</div>
+         <div class="wrap" v-for="listItem in list" :key="listItem.changeId">
+            <div class="row-wrap">
+                <div class="time">{{ utc2local(listItem.changeTime, 'yyyy-MM-DD HH:mm:ss') }}</div>
+                <div class="time">修改人{{ listItem.operName }}</div>
+            </div>
+            <div class="row-wrap-1">
+                <div class="title bold">修改内容：</div>
+                <div>{{ listItem.changeContent }}</div>
+            </div>
+            <div class="row-wrap-1" v-if="listItem.changeReason">
+                <div class="title bold">修改原因：</div>
+                <div>{{ listItem.changeReason }}</div>
+            </div>
+         </div>
+       </div>
+  
+</template>
+<script>
+export default {
+    props: {
+        list: {
+            type: Array,
+            default: () => []
+        }
+    },
+    name: 'changrLogList',
+    data() {
+        return {}
+    }
+}
+</script>
+<style scoped lang="scss">
+.wrap {
+    padding:10px 20px;
+    margin-bottom: 10px;
+    background-color: #f2f2f2;
+}
+.bold {
+    font-weight: bold;
+}   
+.row-wrap {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    .time {
+        font-size:12px;
+    }
+}
+.row-wrap-1 {
+    display: flex;
+    margin-bottom: 10px;
+    .title {
+        min-width: 70px;
+    }
+}
+</style>

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

@@ -157,22 +157,22 @@
               <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-form-item class="mt20" :label="$t('contract.secondNotifier') + ':'">{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.companyName : "" }}</el-form-item>
                   </el-row>
                 </template>
                 <el-form-item :label="$t('contract.taxId') + ':'">
-                  {{ '73855725-000-23-0' }}
+                  {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.taxNumber : "" }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.notifierAddress') + ':'">
-                  {{ 'FLAT/RM 07, 12/F, CHEVALIER COMMERCIAL CENTRE, 8 WANG HOI ROAD, KOWLOON BAY' }}
+                  {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.address : "" }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.contact') + ':'">
-                  {{ 'Ms. Zhou' }}
+                  {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.contactPerson : "" }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.phoneNumber') + ':'">
-                  {{ '00-852 53816912' }}
+                  {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.phoneNumber : "" }}
                 </el-form-item>
-                <el-form-item :label="$t('contract.email') + ':'">{{ 'info@tyzltech.com' }}</el-form-item>
+                <el-form-item :label="$t('contract.email') + ':'">{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.email : ""  }}</el-form-item>
               </el-collapse-item>
             </el-collapse>
 
@@ -288,7 +288,7 @@ 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 { getBizContract, changeBizStatus, getSecondNotifyInfo } from '../../../api/biz/bizContract'
 import FileUpload from '../../../components/FileUpload/s3.vue'
 
 export default {
@@ -336,7 +336,8 @@ export default {
         notifierCompanyId: [{ required: true, trigger: 'blur', message: this.$t('bill.tip4') }],
         goodsName: [{ required: true, trigger: 'blur' }]
       },
-      contract: null
+      contract: null,
+      secondNotifyInfoInfo: null
     }
   },
   watch: {
@@ -367,7 +368,9 @@ export default {
       }
     }
   },
-  created() {},
+  created() {
+    this.getSecondNotifyInfo();
+  },
   methods: {
     async handleEdit(contractId, dealId) {
       const loading = this.openLoading()
@@ -597,7 +600,12 @@ export default {
           }
         }
       })
-    }
+    },
+    getSecondNotifyInfo() {
+      getSecondNotifyInfo().then((res) => {
+        this.secondNotifyInfoInfo = res.data;
+      })
+    },
   }
 }
 </script>

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

@@ -0,0 +1,102 @@
+<!--
+ * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @Date: 2024-08-20 10:37:30
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-08-20 13:45:55
+ * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/contractTracing/queryDeductionRecords.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+    <el-dialog
+      title="定金扣减记录"
+      :visible.sync="dialogVisible"
+      width="800px"
+      :modal="false"
+     >
+      <el-table 
+        :data="tableList"
+        :cell-style="{'text-align': 'center'}"
+        :header-cell-style="{'text-align': 'center'}"
+      >
+        <el-table-column
+          prop="billOfLadingNo"
+          label="提单号"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="containerNumber"
+          label="柜数"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositTotalAmount"
+          label="定金总额">
+          <template slot-scope="{ row }">
+            {{ row.purchaseDepositTotalAmount ? "$" + row.purchaseDepositTotalAmount : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositBalance"
+          label="上次剩余定金">
+            <template slot-scope="{ row }">
+                {{ row.purchaseDepositBalance ? "$" + row.purchaseDepositBalance : '' }}
+            </template>
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositAmount"
+          label="扣减定金">
+          <template slot-scope="{ row }">
+            <span class="edit-style" v-if="row.purchaseDepositAmount" @click.stop="jumpFileManage(row)">{{ row.purchaseDepositAmount ? "$" + row.purchaseDepositAmount : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositRemainAmount"
+          label="定金余额">
+            <template slot-scope="{ row }">
+                {{ row.purchaseDepositRemainAmount ? "$" + row.purchaseDepositRemainAmount : '' }}
+            </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+</template>
+
+<script>
+import { deductionRecords } from '../../../api/biz/bizShipment'
+
+export default {
+  name: 'DoctorAdminComponentsQueryDeductionRecords',
+
+  data() {
+    return {
+        tableList:[],
+        dialogVisible: false
+    };
+  },
+
+  mounted() {
+    
+  },
+
+  methods: {
+    handlerOpen(shipmentId) {
+        this.dialogVisible = true
+        deductionRecords({shipmentId}).then((res) => {
+            this.tableList = res.rows
+        })
+    },
+    jumpFileManage(row) {
+        window.open(`/contract/tracing/detail/${row.purchaseContractId}?activeName=fourth&deductionRecordsShipmentId=${row.shipmentId}`)
+    }
+
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.edit-style {
+  cursor: pointer;
+  color: #409eff;
+}
+
+</style>

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

@@ -2,115 +2,238 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2023-07-31 17:40:56
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-04-02 17:58:33
+ * @LastEditTime: 2024-08-20 14:23:13
  * @FilePath: /doctor-admin-components/packages/src/views/biz/contractTracing/chargingDialog.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
   <div class="app-container">
     <!-- 合同争议详情对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form :model="form">
-        <el-row>
+        <el-table 
+        :data="form.containerPurchaseAmountRespList"
+        >
+          <el-table-column align="center" prop="containerNo" label="柜号"></el-table-column>
+          <el-table-column align="center" label="货物名称">
+            <template slot-scope="{ row }">
+              <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">{{item.askName}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="净量(MT)" prop="goodsNetWeight">
+              <template slot-scope="{ row }">
+                <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
+                  <span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{item.goodsNetWeight}}</span>
+                </div>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="单价($)" width="100" prop="purchasePriceResult">
+            <template slot-scope="{ row }">
+              <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
+                <span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{item.purchasePriceResult}}</span>
+              </div>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="修正净重(MT)" width="130" prop="purchaseActualNetWeight">
+            <template slot-scope="{ row }">
+              <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
+                <span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{item.purchaseActualNetWeight}}</span>
+                <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item,'purchaseActualNetWeight', '1')"/>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="修正单价($)" width="130" prop="purchaseActualUnitPrice">
+            <template slot-scope="{ row }">
+              <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
+                <span :style="item.purchasePriceResult != item.purchaseActualUnitPrice ? 'color:red' : ''"> {{item.purchaseActualUnitPrice}}</span>
+                <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(item, 'purchaseActualUnitPrice', '1')"/>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="amount" label="采购金额($)" width="130"></el-table-column>
+          <el-table-column align="center" prop="purchaseDepositAmount" label="扣减定金($)" width="130"></el-table-column>
+          <el-table-column align="center" label="尾款">
+            <template slot-scope="{ row }">{{ (row.amount - row.purchaseDepositAmount).toFixed(2) }}</template>
+          </el-table-column>
+        </el-table>
+        <div class="my-footer">
+          <div style="width:65px;text-align:center"> 总计</div>
+          <div> 柜数：{{ form && form.containerPurchaseAmountRespList && form.containerPurchaseAmountRespList.length }}柜</div>
+          <div>装运总净重： {{form.totalNetWeight + 'MT'}}</div>
+          <div>装运总修正净重：{{ form.actualTotalNetWeight || 0 + 'MT'}}</div>
+          <div>采购总金额：$ {{ form.totalPurchaseAmount  }}
+            <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseActualTotalAmount', '2')"/>
+          </div>
+          <div>本次扣减定金：$ {{ form.purchaseDepositAmount }}
+            <i class="el-icon-edit-outline edit-style" @click.stop="editInfo(form,'purchaseDepositAmount', '2')"/>
+          </div>
+          <div>采购总尾款：$ {{ form.totalPurchaseAmount - form.purchaseDepositAmount }}</div>
+        </div>
+         <!-- 自定义合并行 -->
+        <div>
+
+        </div>
+        <el-row style="margin-top:20px">
           <el-col :span="8">
-            <el-row>
-              <el-col :span="18">
-                <el-form-item label="本次扣减定金:"
-                  >{{ '$' + form.purchaseDepositAmount ? form.purchaseDepositAmount : '' }}
-                  <el-tooltip class="item" effect="dark" content="当前提单抵扣定金金额" placement="top-start">
-                    <span>
-                      <i class="el-icon-warning" />
-                    </span>
-                  </el-tooltip>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-button type="text" @click="updateShipmentDepositAmount(form.shipmentId, form.purchaseDepositAmount)">编辑</el-button>
-              </el-col>
-            </el-row>
+            <el-form-item label="本次装运总修正净重:">
+              <el-tooltip class="ml10" effect="dark" content="本次一共装了多少吨的货（取修正重量汇总）" placement="top">
+                <span>
+                   {{ form.actualTotalNetWeight || 0 + 'MT'}}
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="上次剩余定金余额:">
-              {{ '$' + form.purchaseDepositBalanceAmount ? form.purchaseDepositBalanceAmount : '' }}
-              <el-tooltip class="item" effect="dark" content="还剩多少定金可抵扣，可为负数" placement="top-start">
+            <el-form-item label="本次装运柜数:">
+              <el-tooltip class="ml10" effect="dark" content="当前装运装了多少柜" placement="top">
                 <span>
-                  <i class="el-icon-warning" />
-                </span>
-              </el-tooltip>
+                   {{form && form.containerPurchaseAmountRespList && form.containerPurchaseAmountRespList.length }}柜
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="定金总额:"
-              >{{ '$' + form.totalPurchaseDepositAmount ? form.totalPurchaseDepositAmount : '' }}
-              <el-tooltip class="item" effect="dark" content="定金发票一共有多少" placement="top-start">
+            <el-form-item label="定金总额:">
+              <el-tooltip class="ml10" effect="dark" content="采购定金发票一共已付多少金额" placement="top">
+                 <span>
+                    $ {{
+                      form.totalPurchaseDepositAmount
+                    }}
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="总已装运净重:">
+              <el-tooltip class="ml10" effect="dark" content="该采购合同一共装了多少吨的货" placement="top">
                 <span>
-                  <i class="el-icon-warning" />
-                </span>
-              </el-tooltip>
+                   {{form.totalNetWeight + 'MT'}}
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
-            <el-form-item label="采购尾款:">{{ '$' + (form.totalPurchaseAmount - form.purchaseDepositAmount).toFixed(2) }}</el-form-item>
+            <el-form-item label="总已装运柜数:">
+              <el-tooltip class="ml10" effect="dark" content="此采购合同一共已经装了多少柜（根据最新的装运数据实时刷新）" placement="top">
+                <span>
+                   {{form.loadedContainerNumber + '柜'}}
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="装运总价:">{{ '$' + form.totalPurchaseAmount }}</el-form-item>
+            <el-form-item label="上次剩余定金:">
+              <el-tooltip class="ml10" effect="dark" content="创建时间在此之前的装运还剩多少定金可以抵扣，不会随着上次的抵扣金额中途变更而刷新，可为负数" placement="top">
+                <span>
+                  <span v-if="form.purchaseDepositBalanceAmount == null"></span>
+                  <span v-else>
+                    $ {{ form.purchaseDepositBalanceAmount }}
+                     <span @click.stop="queryDeductionRecords" class="edit-style">点击查询扣减记录</span>
+                  </span>
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
+            </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
-            <el-form-item label="重量/柜数:">{{ form.totalNetWeight + 'MT/' + form.containerNumber + '柜' }}</el-form-item>
+            <el-form-item label="签约总净重:">
+              <el-tooltip class="ml10" effect="dark" content="该采购合同一共签了多少吨的货（实时刷新合同的签约重量）" placement="top">
+                <span>
+                   {{form.signedContractWeight + 'MT'}}
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="已装柜数/签约柜数:">{{ form.loadedContainerNumber + '柜/' + form.signedContainerNumber + '柜' }}</el-form-item>
+            <el-form-item label="本次扣减定金基于总柜数:">
+              <el-tooltip class="ml10" effect="dark" content="生成此装运时，采购合同签了多少柜（在此装运后再修改合同不刷新该数据）" placement="top">
+                <span>
+                   {{(form.purchaseDepositContainerNumber || 0) + '柜'}}
+                   <i class="el-icon-question"></i>
+                   <span class="edit-style" @click.stop="editInfo(form,'purchaseDepositContainerNumber', '2')">编辑</span>
+                 </span>
+                </el-tooltip>
+            </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-table :data="form.containerPurchaseAmountRespList">
-          <el-table-column align="center" prop="containerNo" label="柜号"></el-table-column>
-          <el-table-column align="center" label="货物名称">
-            <template slot-scope="{ row }">
-              <div style="white-space: pre-line !important">{{ getColumnProp(row, 'askName') }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="重量(MT)">
-            <template slot-scope="{ row }">
-              <div style="white-space: pre-line !important">{{ getColumnProp(row, 'goodsNetWeight') }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="单价($)" width="130">
-            <template slot-scope="{ row }">
-              <div v-for="(item, index) in getColumnPropArray(row)" :key="index">
-                {{ item.purchasePriceResult }};
-                <!-- 显示每个项的值 -->
-                <el-tooltip
-                  v-if="item.quoteType != 'FIXED' && row.pointPrice"
-                  class="item"
-                  effect="dark"
-                  :content="getPurchaseAmountTip(item, row)"
-                  placement="top-start"
-                >
-                  <span>
-                    <i class="el-icon-question" />
+          <el-col :span="8">
+            <el-form-item label="本次扣减定金:">
+              <el-tooltip class="ml10" effect="dark" content="当前装运抵扣了多少定金" placement="top">
+                <span>
+                  <span v-if="form.purchaseDepositAmount == null"/>
+                  <span v-else>
+                    $ {{ form.purchaseDepositAmount}}
+                  </span>
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="签约总柜:">
+              <el-tooltip class="ml10" effect="dark" content="采购合同签了多少柜（根据最新的合同数据实时刷新）" placement="top">
+                <span>
+                   {{(form.signedContainerNumber || 0) + '柜'}}
+                   <i class="el-icon-question"></i>
+                 </span>
+                </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="本次剩余定金:">
+              <el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣，不会随着下次的抵扣行为刷新，可为负数" placement="top">
+                <span>
+                  <span v-if="form.thisRemainingDeposit == null"></span>
+                  <span v-else>
+                    $ {{ form.thisRemainingDeposit }}
+                  </span>
+                  <i class="el-icon-question"></i>
+                </span>
+                </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="总剩余定金:">
+              <el-tooltip class="ml10" effect="dark" content="当前时间该合同还剩余多少定金可以用于抵扣，随着每次的抵扣行为实时刷新，可为负数" placement="top">
+                <span>
+                  <span v-if="form.purchaseDepositBalanceAmount == null"></span>
+                  <span v-else>
+                    $ {{ form.purchaseDepositBalanceAmount }}
                   </span>
+                   <i class="el-icon-question"></i>
+                 </span>
                 </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item>
+              <div>
+                <span style="font-weight: bold;margin-right:5px;">备注:</span>
+                <el-button size="mini" v-if="!remarkEditable" type="primary" @click.stop="remarkEditable = true">编辑备注</el-button>
+                <el-button size="mini" v-else type="success" @click.stop="editRemark">保存备注</el-button>
               </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="amount" label="小计($)" width="130"></el-table-column>
-          <el-table-column align="center" prop="purchaseDepositAmount" label="扣减定金($)" width="130"></el-table-column>
-          <el-table-column align="center" label="单柜尾款">
-            <template slot-scope="{ row }">{{ (row.amount - row.purchaseDepositAmount).toFixed(2) }}</template>
-          </el-table-column>
-        </el-table>
-      </el-form>
+              <el-input type="textarea" :rows="2" v-model="form.remark" :disabled="!remarkEditable"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+       </el-form>
+       <ShipmentPurchaseAmountEditDialog ref="ShipmentPurchaseAmountEditDialog" @refresh="refresh"></ShipmentPurchaseAmountEditDialog>
+       <ChangrLogList :list="form.changeLogList"></ChangrLogList>
+       <QueryDeductionRecords ref="QueryDeductionRecords"></QueryDeductionRecords>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { getPurchaseAmount, updateBizShipment } from '../../../api/biz/bizShipment'
+import ShipmentPurchaseAmountEditDialog from './shipmentPurchaseAmountEditDialog.vue'
+import ChangrLogList from './changrLogList.vue'
+import QueryDeductionRecords from './queryDeductionRecords.vue'
 
 export default {
   name: 'ShipmentPurchaseAmount',
@@ -119,19 +242,28 @@ export default {
       // 遮罩层
       loading: true,
       // 弹出层标题
-      title: '',
+      title: '尾款计算明细',
       // 是否显示弹出层
       open: false,
       // 表单参数
-      form: {},
+      form: {
+        changrLogList: [],
+      },
       // 非单个禁用
       single: true,
       // 非多个禁用
       multiple: true,
       //
-      contract: null
+      contract: null,
+      remarkEditable: false,
+      tableList: []
     }
   },
+  components: {
+    ShipmentPurchaseAmountEditDialog,
+    ChangrLogList,
+    QueryDeductionRecords
+  },
   props: {
     getContractFileInfoCallback: {
       type: Function
@@ -140,6 +272,97 @@ export default {
   created() {},
   mounted() {},
   methods: {
+    /**
+     * @description: 查询扣减记录
+     * @return {*}
+     */
+    queryDeductionRecords() {
+      if(!this.form.shipmentId) {
+          this.$message.error('shipmentId不能为空')
+          return
+      }
+      this.$refs.QueryDeductionRecords.handlerOpen(this.form.shipmentId)
+
+    },
+    /**
+     * @description: 编辑备注
+     * @return {*}
+     */
+    editRemark() {
+      updateBizShipment({
+        shipmentId: this.form.shipmentId,
+        remark: this.form.remark
+      }).then(() => {
+        this.$message({
+          type: 'success',
+          message: '修改成功'
+        })
+        this.refresh()
+        this.remarkEditable = false
+      })
+    },
+    // 编辑信息
+    editInfo(detail, prop, type) {
+      this.remarkEditable = false
+      let textInfo = {}
+      let info = {}
+      if(type == 1) {
+        info = {
+          containerId: detail.containerId,
+          containerDetailId: detail.containerDetailId,
+          purchaseActualNetWeight: detail.purchaseActualNetWeight,
+          purchaseActualUnitPrice: detail.purchaseActualUnitPrice,
+        } 
+        // 修改表格净重
+        if(prop == 'purchaseActualNetWeight') {
+          textInfo = {
+            title: `请输入柜号${detail.containerNo}的修正净重`,
+            label: detail.askName,
+            unit: 'MT'
+          }
+        }
+        // 修改表格单价
+        if(prop == 'purchaseActualUnitPrice') {
+          textInfo = {
+            title: `请输入柜号${detail.containerNo}的修正单价`,
+            label: detail.askName,
+            unit: '$'
+          }
+        }
+      }
+
+      if(type == 2) {
+        info = {
+          shipmentId: detail.shipmentId,
+          purchaseDepositContainerNumber: detail.purchaseDepositContainerNumber,
+          purchaseActualTotalAmount: detail.totalPurchaseAmount,
+          purchaseDepositAmount: detail.purchaseDepositAmount,
+        }
+        if(prop == 'purchaseDepositContainerNumber') {
+          textInfo = {
+            title: `请输入本次扣减定金基于总柜数`,
+            label: '本次扣减定金基于总柜数',
+            unit: '柜'
+          }
+        }
+        if(prop == 'purchaseActualTotalAmount') {
+          textInfo = {
+            title: `直接修改采购总金额`,
+            label: '',
+            unit: '$'
+          }
+        }
+
+        if(prop == 'purchaseDepositAmount') {
+          textInfo = {
+            title: `请输入本次扣减定金`,
+            label: '本次扣减定金',
+            unit: '$'
+          }
+        }
+      }
+      this.$refs.ShipmentPurchaseAmountEditDialog.handlerOpen(info, type, textInfo,prop)
+    },
     //更新装运采购定金
     updateShipmentDepositAmount(shipmentId, purchaseDepositAmount) {
       this.$prompt('本次扣减定金$', '请输入本次扣减定金', {
@@ -203,7 +426,24 @@ export default {
         this.form = res.data
         this.open = true
       })
+    },
+    refresh() {
+      this.handleShow(this.form.shipmentId)
+      this.getContractFileInfoCallback && this.getContractFileInfoCallback()
     }
   }
 }
 </script>
+<style scoped lang="scss">
+.edit-style {
+  cursor: pointer;
+  color: #409eff;
+}
+.my-footer {
+  display: flex;
+  justify-content: space-between;
+  background-color: #f5f7fa;
+  padding: 10px;
+  font-weight: bold;
+}
+</style>

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

@@ -0,0 +1,152 @@
+<!--
+ * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @Date: 2024-08-19 15:46:00
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-08-20 14:21:29
+ * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+        <el-dialog
+          :title="title"
+          v-if="dialogVisible"
+          :visible.sync="dialogVisible"
+          width="40%"
+          :modal="false"
+          :before-close="handleClose">
+          <div>
+            <el-form ref="form" :model="form" label-width="200px">
+                <div v-if="prop == 'purchaseActualTotalAmount'">
+                    <div>
+                        由于
+                    </div>
+                    <el-input  
+                        type="textarea"
+                        placeholder="请详细说明是什么业务场景导致系统无法自动计算？"
+                        :autosize="{ minRows: 2, maxRows: 4}"
+                        v-model="changeReason"/>
+                </div>
+                <div v-if="prop == 'purchaseActualTotalAmount'" style="margin:20px 0">
+                    需要将采购总金额由$ <span style="color:#1890ff">{{ currentVal }}</span> 直接改成
+                </div>
+              <el-form-item :label="label">
+                  <el-input v-decimal="decimal" v-model="form.vlaue" placeholder="请输入标签">
+                    <template slot="prepend" v-if="unitPostion == 'pre'">{{ unit }}</template>
+                    <template slot="append"  v-if="unitPostion == 'append'">{{ unit }}</template>
+                </el-input>
+              </el-form-item>
+            </el-form>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="confirm">确 定</el-button>
+          </span>
+        </el-dialog>
+  
+</template>
+<script>
+import { containerEditBatch, updateBizShipment } from '../../../api/biz/bizShipment'
+export default {
+    data() {
+        return {
+            dialogVisible: false,
+            title: '',
+            label:'',
+            form: {
+                vlaue:''
+            },
+            type:0,
+            prop:'',
+            info:{},
+            unit:'',
+            unitPostion:'pre',
+            changeReason:null,
+            currentVal:null,
+            decimal:0
+            
+        }
+    },
+    methods: {
+        confirm() {
+            if(!this.form.vlaue) {
+                this.$message({
+                    message: '请输入修改内容',
+                    type: 'warning'
+                });
+                return;
+            }
+            // table内容修改净重 修改单价
+            if(this.type == 1) {
+                let info = {
+                    containerId: this.info.containerId,
+                    containerDetailId: this.info.containerDetailId
+                }
+                info[this.prop] = this.form.vlaue;
+
+                containerEditBatch([info]).then(res => {
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success'
+                    });
+                    
+                    this.$emit('refresh');
+                    this.dialogVisible = false;
+                })
+            }
+            // shipment信息修改
+            if(this.type == 2) {
+                let info = {
+                    shipmentId: this.info.shipmentId,
+                }
+                info[this.prop] = this.form.vlaue;
+                if(this.changeReason) {
+                    info.changeReason = this.changeReason;
+                }
+
+                updateBizShipment(info).then(res => {
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success'
+                    });
+
+                    this.$emit('refresh');
+                    this.dialogVisible = false;
+                })
+            }
+        },
+        handlerOpen(info, type, textInfo, prop) {
+            this.title = textInfo.title;
+            this.label = textInfo.label;
+            this.unit = textInfo.unit;
+            this.type = type;
+            this.prop = prop;
+            this.info = info;
+            this.form.vlaue = info[prop];
+            if(prop == 'purchaseActualTotalAmount') {
+                this.currentVal = info[prop];
+                this.form.vlaue = null
+            }
+
+            if(this.unit == 'MT' || this.unit == '柜') {
+                this.unitPostion = 'append'
+                if(this.unit == 'MT') {
+                    this.decimal = 3
+                } else {
+                    this.decimal = 0
+                }
+            } 
+
+            if(this.unit == '$') {
+                this.unitPostion = 'pre'
+                this.decimal = 2
+            }
+            this.dialogVisible = true;
+        },
+        handleClose(done) {
+            this.dialogVisible = false;
+            done();
+        }
+
+    }
+}
+</script>