doctor-admin-components 1.0.14-beta.64 → 1.0.14-beta.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/packages/src/utils/index.js +1 -1
  3. package/packages/src/views/biz/contractTracing/contractPdf.vue +8 -5
  4. package/packages/src/views/biz/contractTracing/info.vue +3 -3
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "doctor-admin-components",
3
3
  "version1": "1.0.11",
4
- "version": "1.0.14-beta.64",
4
+ "version": "1.0.14-beta.66",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
package/packages/src/utils/index.js CHANGED
@@ -6,7 +6,7 @@ import CryptoJS from "crypto-js";
6
6
  */
7
7
  export function formatDate(cellValue) {
8
8
  if (cellValue == null || cellValue == "") return "";
9
- var date = new Date(cellValue);
9
+ var date = new Date(cellValue - 0);
10
10
  var year = date.getFullYear();
11
11
  var month =
12
12
  date.getMonth() + 1 < 10
package/packages/src/views/biz/contractTracing/contractPdf.vue CHANGED
@@ -1,18 +1,21 @@
1
1
  <template>
2
2
  <div class="app-container">
3
3
  <div class="info" id="printPdf">
4
- <div class="type">
5
- {{ contract.contractType == 'sale' ? 'Sales Contract' : 'Purchase Contract' }}
4
+ <div style="display: flex; justify-content: space-between; align-items: center">
5
+ <div class="type">
6
+ {{ contract.contractType == 'sale' ? 'Sales Contract' : 'Purchase Contract' }}
7
+ </div>
8
+ <div class="type" style="text-align: right">Contract Date: {{ $formatDate(contract.createTime) }}</div>
6
9
  </div>
7
10
  <div class="title">TTYY INTERNATIONAL LIMITED</div>
8
11
  <div class="sub-title mb20">FLAT/RM 07, 12/F, CHEVALIER COMMERCIAL CENTRE 8, WANG HOI ROAD, KOWLOON BAY, KL, HONG KONG</div>
9
12
  <el-row class="mb10">
10
13
  <el-col :span="5">
11
- {{ contract.contractType == 'sale' ? 'Sales Order #:' : 'Purchase Order' }}
14
+ {{ contract.contractType == 'sale' ? 'Sales Order #:' : 'Purchase Order #:' }}
12
15
  </el-col>
13
16
  <el-col :span="7">{{ contract.contractNo }}</el-col>
14
- <el-col :span="5">Reference#: {{ contract.reference }}</el-col>
15
- <el-col :span="7"></el-col>
17
+ <el-col :span="7">Reference#: </el-col>
18
+ <el-col :span="5">{{ contract.reference }}</el-col>
16
19
  </el-row>
17
20
  <info :form="contract" :dynamicTags="dynamicTags" :customClause="customClause"></info>
18
21
  <contract-clause v-if="contract.contractClause" style="margin-top:60px" :form="contract"></contract-clause>
package/packages/src/views/biz/contractTracing/info.vue CHANGED
@@ -3,14 +3,14 @@
3
3
  <el-row :gutter="20">
4
4
  <el-col :span="12">
5
5
  <div class="company">
6
- <div class="company-type">Seller</div>
6
+ <div class="company-type">Party A (Seller):</div>
7
7
  <div class="company-text">{{ form.supplierContractCompany.companyEnglishName }}</div>
8
8
  <div class="company-text">{{ form.supplierContractCompany.address }}</div>
9
9
  </div>
10
10
  </el-col>
11
11
  <el-col :span="12">
12
12
  <div class="company">
13
- <div class="company-type">Buyer</div>
13
+ <div class="company-type">Party B (Buyer):</div>
14
14
  <div class="company-text">{{ form.buyContractCompany.companyEnglishName }}</div>
15
15
  <div class="company-text">{{ form.buyContractCompany.address }}</div>
16
16
  </div>
@@ -27,7 +27,7 @@
27
27
  >
28
28
  <el-table-column label="Description" align="center" prop="askName"></el-table-column>
29
29
  <el-table-column label="Commodity Name" align="center" prop="askAliasName"></el-table-column>
30
- <el-table-column label="Quantity(MT)" align="center" prop="weight">
30
+ <el-table-column label="Quantity" align="center" prop="weight">
31
31
  <template slot-scope="scope">{{ scope.row.weight }}</template>
32
32
  </el-table-column>
33
33
  <el-table-column label="Unit Price/MT" align="center" width="200">