doctor-admin-components 1.0.14-beta.7 → 1.0.14-beta.70

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

@@ -0,0 +1,363 @@
+<template>
+  <div v-if="form" style="margin-bottom:40px">
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <div class="company">
+          <div class="company-type">Party A (Seller):</div>
+          <div class="company-text">{{ form.supplierContractCompany.companyEnglishName }}</div>
+          <div class="company-text">{{ form.supplierContractCompany.address }}</div>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div class="company">
+          <div class="company-type">Party B (Buyer):</div>
+          <div class="company-text">{{ form.buyContractCompany.companyEnglishName }}</div>
+          <div class="company-text">{{ form.buyContractCompany.address }}</div>
+        </div>
+      </el-col>
+    </el-row>
+    <el-divider></el-divider>
+    <div class="item">
+      <el-table
+        :data="form.contractDetailList"
+        :header-cell-style="{ backgroundColor: '#ffffff' }"
+        :row-style="{ border: 'none' }"
+        :summary-method="getSummaries"
+        show-summary
+      >
+        <el-table-column label="Description" align="center" prop="askName"></el-table-column>
+        <el-table-column label="Commodity Name" align="center" prop="askAliasName"></el-table-column>
+        <el-table-column label="Quantity" align="center" prop="weight">
+          <template slot-scope="scope">{{ scope.row.weight }}</template>
+        </el-table-column>
+        <el-table-column label="Unit Price/MT" align="center" width="200">
+          <template slot-scope="{ row }">
+            <div v-if="form.quoteType == 'FIXED'">
+              <span v-if="form.contractType == 'sale'">${{ row.quotePrice }}</span> <span v-else>${{ row.sllerPrice }}</span>
+            </div>
+            <div v-if="isCmx(form.quoteType)">
+              <span v-if="form.contractType == 'sale'">{{ `$(${form.quoteType}-${row.quotePrice})*2204.62` }}</span>
+              <span v-else>{{ `$(${form.quoteType}-${row.sllerPrice})*2204.62` }}</span>
+            </div>
+            <div v-if="isLme(form.quoteType)">
+              <div v-if="checkElementItem(row.elementContent)">
+                {{ form.contractType == 'sale' ? row.quotePriceFormula : row.sellerPriceFormula }}
+              </div>
+              <div v-else>
+                <span v-if="form.contractType == 'sale'">{{ ` $(${form.quoteType} *${row.quotePrice}%) ` }}</span>
+                <span v-else>{{ `$(${form.quoteType} *${row.sllerPrice}%)` }}</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="Service fee" align="center">
+          <template slot-scope="scope">{{ scope.row.serviceFee ? `$${scope.row.serviceFee}/MT` : '' }}</template>
+        </el-table-column>
+
+        <!-- 总价 -->
+        <el-table-column label="Net Unit Price/MT" align="center">
+          <template slot-scope="scope">
+            <span v-if="form.quoteType == 'FIXED' && form.contractType == 'purchase'">{{ '$' + (scope.row.sllerPrice - Number(scope.row.serviceFee)) }}</span>
+            <span v-else-if="form.quoteType == 'FIXED' && form.contractType == 'sale'">
+              {{ '$' + (Number(scope.row.quotePrice) + Number(scope.row.serviceFee)) }}
+            </span>
+            <span v-else-if="isLme(form.quoteType) && form.contractType == 'purchase'">
+              <div v-if="checkElementItem(scope.row.elementContent)">
+                {{ scope.row.sellerPriceFormula + '- $' + Number(scope.row.serviceFee) }}
+              </div>
+              <div v-else>
+                {{ '$(' + form.quoteType + ' * ' + scope.row.sllerPrice + '%) - $' + Number(scope.row.serviceFee) }}
+              </div>
+            </span>
+            <span v-else-if="isLme(form.quoteType) && form.contractType == 'sale'">
+              <div v-if="checkElementItem(scope.row.elementContent)">
+                {{ scope.row.quotePriceFormula + '+ $' + Number(scope.row.serviceFee) }}
+              </div>
+              <div v-else>
+                {{ '$(' + form.quoteType + ' * ' + scope.row.quotePrice + '%) + $' + Number(scope.row.serviceFee) }}
+              </div>
+            </span>
+            <span v-else-if="isCmx(form.quoteType) && form.contractType == 'purchase'">
+              {{ '${(' + form.quoteType + '-' + scope.row.sllerPrice + ')*2204.62} - $' + Number(scope.row.serviceFee) }}
+            </span>
+            <span v-else>
+              {{ '${(' + form.quoteType + '-' + scope.row.quotePrice + ')*2204.62} + $' + Number(scope.row.serviceFee) }}
+            </span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-divider></el-divider>
+
+    <el-descriptions :column="1" :labelStyle="{ fontWeight: 'bold' }">
+      <el-descriptions-item label="Freight Terms">{{ form.freightTerms ? `Incoterms2020 ${form.freightTerms}` : '' }}</el-descriptions-item>
+      <el-descriptions-item label="Payment Terms">
+        <div>{{ form.paymentTermFullText }}</div>
+      </el-descriptions-item>
+      <el-descriptions-item label="Price Fixing Option" v-if="form.livePriceSwitch">
+        From the loading date to {{form.livePriceDays}} days {{form.livePriceForm}} cargo arrives at POD in {{form.livePriceUsertype}} option.
+        <span v-if="form.contractType == 'sale'">Time based on China Standard Time (UTC+8).</span>
+      </el-descriptions-item>
+
+      <el-descriptions-item label="Origin Country/Region">{{ form.originCountry }}</el-descriptions-item>
+      <el-descriptions-item label="Loading Country/Region">{{ form.loadingCountry }}</el-descriptions-item>
+      <el-descriptions-item v-if="form.freightTerms != 'EXW'" label="Destination">{{ form.destination }}</el-descriptions-item>
+      <el-descriptions-item v-else label="EXW Address">{{ form.exw }}</el-descriptions-item>
+      <el-descriptions-item label="Containers">
+        {{ form.numberOfContainersForTwenty }}x 20' Container
+        <br />
+        {{ form.numberOfContainersForForty }}x 40' Container
+        <br />
+        {{ form.numberOfContainersForTwentyOrForty }}x 20'/40' Container
+        <br />
+      </el-descriptions-item>
+      <el-descriptions-item label="Latest shipment"
+        >The goods shall be fully loaded within {{ form.latestShipment }} days as of the date when the contract is signed</el-descriptions-item
+      >
+      <el-descriptions-item label="Required documents" v-if="isMobile">
+        <div style="display: flex; flex-direction: column">
+          <el-tag :key="tag" v-for="tag in dynamicTags" class="mr5" style="margin-top: 5px">{{ tag }}</el-tag>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="Required documents" v-else>
+        <div style="display: flex; flex-wrap: wrap">
+          <el-tag :key="tag" v-for="tag in dynamicTags" class="mr5" style="margin-top: 5px">{{ tag }}</el-tag>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="Shipment Quantity Tolerance"> ± {{ form.toleranceFloat * 100 }}%</el-descriptions-item>
+      <el-descriptions-item label="Shortage Tolerance"> &lt;{{ form.weightTolerance }}%{{ form.weightToleranceWeight > 0 ? ` / ${form.weightToleranceWeight}kg` : '' }}</el-descriptions-item>
+      <el-descriptions-item label="Packing Type"> {{ form.packingMethod ? form.packingMethod.replace(/,/g, '/') : '' }}</el-descriptions-item>
+      <el-descriptions-item label="Partial Shipment"> {{ form.partialShipment }}</el-descriptions-item>
+      <el-descriptions-item label="Transshipment"> {{ form.transshipment }}</el-descriptions-item>
+      <el-descriptions-item label="Quality" v-if="form.qualityCertificateSwitch">{{ form.qualityCertificate }}</el-descriptions-item>
+      <el-descriptions-item label="Claim" v-if="form.claimSwitch">
+        <div v-html="form.claim" style="white-space: pre-wrap; word-break: break-word;"></div>
+      </el-descriptions-item>
+      <el-descriptions-item label="Timeline of document submission" v-if="form.arbitrationSwitch">
+        <div v-html="form.arbitration" style="white-space: pre-wrap; word-break: break-word;"></div>
+      </el-descriptions-item>
+      <el-descriptions-item label="Specification" v-if="form.memoSwitch">{{ form.memo }}</el-descriptions-item>
+      <el-descriptions-item v-for="(item, index) in this.customClause" :label="item.title" :key="index">{{ item.content }}</el-descriptions-item>
+    </el-descriptions>
+    <!-- <div class="sign">Please sign below and return.</div> -->
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <div class="company-sign">
+          <el-row>
+            <el-col :span="isMobile ? 12 : 6">
+              <div class="company-sign-title">Party A ({{form.contractType == 'sale' ? 'TTYY' : 'Seller'}})</div>
+            </el-col>
+            <slot name="seller" />
+          </el-row>
+          <div class="company-sign-title">Company Name:</div>
+          <div class="company-sign-text">{{ form.supplierContractCompany.companyEnglishName }}</div>
+          <div class="company-sign-title">Signature:</div>
+          <div class="company-sign-title">Print Name:
+            {{ form.contractType == 'sale' ? form.printName : ''}}
+          </div>
+          <div class="company-sign-title">Title:
+            {{ form.contractType == 'sale' ? form.printTitle : ''}}
+          </div>
+          <div class="company-sign-title">Date:</div>
+          <div class="company-sign-text">{{ parseTime(form.createTime, '{m}/{d}/{y}') }}</div>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div class="company-sign">
+          <el-row>
+            <el-col :span="isMobile ? 12 : 6">
+              <div class="company-sign-title">Party B ({{form.contractType == 'sale' ? 'Buyer' : 'TTYY'}})</div>
+            </el-col>
+            <slot name="buyer" />
+          </el-row>
+          <div class="company-sign-title">Company Name:</div>
+          <div class="company-sign-text">{{ form.buyContractCompany.companyEnglishName }}</div>
+          <div class="company-sign-title">Signature:</div>
+          <div class="company-sign-title">Print Name:
+            {{ form.contractType != 'sale' ? form.printName : ''}}
+          </div>
+          <div class="company-sign-title">Title:
+            {{ form.contractType != 'sale' ? form.printTitle : ''}}
+          </div>
+          <div class="company-sign-title">Date:</div>
+          <div class="company-sign-text">{{ parseTime(form.createTime, '{m}/{d}/{y}') }}</div>
+        </div>
+      </el-col>
+    </el-row>
+    <slot name="select-contract-company"></slot>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'ContractInfo',
+  props: {
+    form: {
+      type: Object,
+      default: null
+    },
+    dynamicTags: {
+      type: Array,
+      default: () => []
+    },
+    customClause: {
+      type: Array,
+      default: () => []
+    },
+    printModel: {
+      type: Boolean,
+      default: false
+    },
+    isMobile: {
+      type: Boolean,
+      default: false
+    }
+  },
+  components: { },
+  data() {
+    return {}
+  },
+  methods: {
+    //确认公司
+    confirmCompany(company, type) {
+      company.email = company.email && company.email.length > 0 ? company.email[0] : ''
+      company.phoneNumber = company.phoneNumber && company.phoneNumber.length > 0 ? company.phoneNumber[0] : ''
+      if (type == 'seller') {
+        this.$set(this.form, 'supplierContractCompany', company)
+        this.form.supplierContractCompanyId = company.contractCompanyId
+        this.form.supplierCompanyId = company.companyId
+      } else if (type == 'buyer') {
+        this.$set(this.form, 'buyContractCompany', company)
+        this.form.buyContractCompanyId = company.contractCompanyId
+        this.form.buyCompanyId = company.companyId
+      }
+    },
+    //选择合同公司
+    selectContractCompany(companyId, type) {
+      this.$refs.selectContractCompany.handleShow(companyId, type)
+    },
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = 'Total'
+          return
+        }
+        const values = data.map((item) => Number(item[column.property]))
+        if (!values.every((value) => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          if (index === 2) {
+            sums[index] += ''
+          } else if (index === 1) {
+            sums[index] = ''
+          } else {
+            sums[index] += ''
+          }
+        } else {
+          sums[index] = ''
+        }
+      })
+
+      return sums
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.info {
+  border: 1px solid #606676;
+  padding: 20px;
+
+  .type {
+    font-size: 13px;
+    font-weight: bold;
+  }
+
+  .title {
+    text-align: center;
+    font-size: 26px;
+    font-weight: bold;
+  }
+
+  .sub-title {
+    margin-top: 20px;
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .company {
+    margin-top: 20px;
+    padding: 10px 20px;
+    border: 1px solid #000;
+    font-size: 10px;
+    height: 130px;
+
+    &-type {
+      font-size: 13px;
+      font-weight: bold;
+      margin-bottom: 10px;
+    }
+
+    &-text {
+      margin-bottom: 10px;
+    }
+  }
+
+  .item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    // 去掉所有的横线
+    ::v-deep.el-table__cell {
+      border-bottom: none;
+    }
+
+    // 只去除表格的最最底部的横线
+    ::v-deep .el-table--border::after,
+    ::v-deep .el-table--group::after,
+    ::v-deep .el-table::before {
+      background-color: transparent;
+    }
+  }
+
+  .sign {
+    height: 230px;
+    display: flex;
+    align-items: center;
+  }
+
+  .company-sign {
+    margin-top: 20px;
+    padding: 10px 20px;
+    font-size: 10px;
+    height: 130px;
+    margin-bottom: 20px;
+
+    &-title {
+      font-size: 13px;
+      font-weight: bold;
+      margin-bottom: 10px;
+    }
+
+    &-text {
+      margin-bottom: 10px;
+    }
+  }
+}
+
+.company-sign-text {
+  color: #606266;
+  font-size: 14px;
+}
+</style>

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;

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

@@ -0,0 +1,103 @@
+<!--
+ * @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-23 13:49:18
+ * @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="1200px"
+      :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 ? "$" +  $formatNumber(row.purchaseDepositTotalAmount, 2) : '0' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositBalance"
+          label="上次剩余定金">
+            <template slot-scope="{ row }">
+                {{ row.purchaseDepositBalance ? "$" +  $formatNumber(row.purchaseDepositBalance,2) : '0' }}
+            </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 ? "$" +  $formatNumber(row.purchaseDepositAmount, 2) : '0' }}</span>
+            <span v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositRemainAmount"
+          label="定金余额">
+            <template slot-scope="{ row }">
+                {{ row.purchaseDepositRemainAmount ? "$" +  $formatNumber(row.purchaseDepositRemainAmount, 2) : '0' }}
+            </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>