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

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 (3) hide show
  1. package/package.json +1 -1
  2. package/packages/src/views/biz/contractTracing/contractPdf.vue +2 -2
  3. package/packages/src/views/biz/contractTracing/info.vue +19 -7
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.66",
4
+ "version": "1.0.14-beta.68",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
package/packages/src/views/biz/contractTracing/contractPdf.vue CHANGED
@@ -5,7 +5,7 @@
5
5
  <div class="type">
6
6
  {{ contract.contractType == 'sale' ? 'Sales Contract' : 'Purchase Contract' }}
7
7
  </div>
8
- <div class="type" style="text-align: right">Contract Date: {{ $formatDate(contract.createTime) }}</div>
8
+ <div class="type" style="text-align: right">Contract Date: {{ $formatDate(contract.createTime) && $formatDate(contract.createTime).split(' ')[0] }}</div>
9
9
  </div>
10
10
  <div class="title">TTYY INTERNATIONAL LIMITED</div>
11
11
  <div class="sub-title mb20">FLAT/RM 07, 12/F, CHEVALIER COMMERCIAL CENTRE 8, WANG HOI ROAD, KOWLOON BAY, KL, HONG KONG</div>
@@ -14,7 +14,7 @@
14
14
  {{ contract.contractType == 'sale' ? 'Sales Order #:' : 'Purchase Order #:' }}
15
15
  </el-col>
16
16
  <el-col :span="7">{{ contract.contractNo }}</el-col>
17
- <el-col :span="7">Reference#: </el-col>
17
+ <el-col :span="7">Reference #: </el-col>
18
18
  <el-col :span="5">{{ contract.reference }}</el-col>
19
19
  </el-row>
20
20
  <info :form="contract" :dynamicTags="dynamicTags" :customClause="customClause"></info>
package/packages/src/views/biz/contractTracing/info.vue CHANGED
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div v-if="form">
2
+ <div v-if="form" style="margin-bottom:40px">
3
3
  <el-row :gutter="20">
4
4
  <el-col :span="12">
5
5
  <div class="company">
@@ -51,8 +51,8 @@
51
51
  </template>
52
52
  </el-table-column>
53
53
 
54
- <el-table-column label="Service fee/MT" align="center">
55
- <template slot-scope="scope">${{ scope.row.serviceFee }}</template>
54
+ <el-table-column label="Service fee" align="center">
55
+ <template slot-scope="scope">{{ scope.row.serviceFee ? `$${scope.row.serviceFee}/MT` : '' }}</template>
56
56
  </el-table-column>
57
57
 
58
58
  <!-- 总价 -->
@@ -145,14 +145,20 @@
145
145
  <el-col :span="12">
146
146
  <div class="company-sign">
147
147
  <el-row>
148
- <el-col :span="isMobile ? 8 : 5">
149
- <div class="company-sign-title">Seller</div>
148
+ <el-col :span="isMobile ? 12 : 6">
149
+ <div class="company-sign-title">Party A ({{form.contractType == 'sale' ? 'TTYY' : 'Seller'}})</div>
150
150
  </el-col>
151
151
  <slot name="seller" />
152
152
  </el-row>
153
153
  <div class="company-sign-title">Company Name:</div>
154
154
  <div class="company-sign-text">{{ form.supplierContractCompany.companyEnglishName }}</div>
155
155
  <div class="company-sign-title">Signature:</div>
156
+ <div class="company-sign-title">Print Name:
157
+ {{ form.contractType == 'sale' ? form.printName : ''}}
158
+ </div>
159
+ <div class="company-sign-title">Title:
160
+ {{ form.contractType == 'sale' ? form.printTitle : ''}}
161
+ </div>
156
162
  <div class="company-sign-title">Date:</div>
157
163
  <div class="company-sign-text">{{ parseTime(form.createTime, '{m}/{d}/{y}') }}</div>
158
164
  </div>
@@ -160,14 +166,20 @@
160
166
  <el-col :span="12">
161
167
  <div class="company-sign">
162
168
  <el-row>
163
- <el-col :span="isMobile ? 8 : 5">
164
- <div class="company-sign-title">Buyer</div>
169
+ <el-col :span="isMobile ? 12 : 6">
170
+ <div class="company-sign-title">Party B ({{form.contractType == 'sale' ? 'Buyer' : 'TTYY'}})</div>
165
171
  </el-col>
166
172
  <slot name="buyer" />
167
173
  </el-row>
168
174
  <div class="company-sign-title">Company Name:</div>
169
175
  <div class="company-sign-text">{{ form.buyContractCompany.companyEnglishName }}</div>
170
176
  <div class="company-sign-title">Signature:</div>
177
+ <div class="company-sign-title">Print Name:
178
+ {{ form.contractType != 'sale' ? form.printName : ''}}
179
+ </div>
180
+ <div class="company-sign-title">Title:
181
+ {{ form.contractType != 'sale' ? form.printTitle : ''}}
182
+ </div>
171
183
  <div class="company-sign-title">Date:</div>
172
184
  <div class="company-sign-text">{{ parseTime(form.createTime, '{m}/{d}/{y}') }}</div>
173
185
  </div>