doctor-admin-components 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doctor-admin-components",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "version1": "1.0.6-beta.4",
   "private": false,
   "main1": "lib/index.umd.min.js",

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

@@ -101,8 +101,8 @@
             type="text"
             @click="handleUserCompany(form.supplierCompanyId, 'seller')"
             buyerAccountId
-            >Select Seller's Company</el-button
-          >
+            >Select Seller's Company
+          </el-button>
         </el-col>
       </el-row>
       <el-form-item label="Company Name" label-width="120px">
@@ -440,42 +440,58 @@
           v-model="form.depositDays"
           size="mini"
           clearable
-          style="width: 240px"
+          style="width: 130px"
         >
-          <template slot="append">Days after the contract</template>
+          <template slot="append">Days</template>
         </el-input>
-      </el-form-item>
-      <el-form-item>
         <el-input
-          v-model="form.balance"
-          placeholder="Please enter balance"
+          v-model="form.depositPaymentForm"
           size="mini"
           clearable
-          style="width: 40%"
+          placeholder="提示输入:after booking"
+          style="width: 170px"
         >
-          <template slot="append">% balance</template>
         </el-input>
+      </el-form-item>
+      <el-form-item label="" label-width="120px">
         <el-input
-          style="width: 30%"
-          v-model="form.balancePaymentType"
+          v-model="form.balance"
           size="mini"
           clearable
+          style="width: 200px"
         >
-          <template slot="append">paid</template>
+          <template slot="prepend">Balance</template>
+          <template slot="append">%</template>
         </el-input>
+
         <el-input
-          style="width: 30%"
           v-model="form.balanceDays"
           size="mini"
           clearable
+          style="width: 130px"
         >
           <template slot="append">Days</template>
         </el-input>
 
-        <el-radio-group v-model="form.balancePaymentForm">
-          <el-radio :label="'Before arrive'">Before arrive</el-radio>
-          <el-radio :label="'After arrival'">After arrival</el-radio>
-        </el-radio-group>
+        <el-select v-model="form.balancePaymentForm" clearable>
+          <el-option label="Before arrive" value="Before arrive"></el-option>
+          <el-option label="After arrival" value="After arrival"></el-option>
+        </el-select>
+
+        <el-row>
+          <el-input
+            style="width: 150px; margin-top: 15px"
+            v-model="form.balancePaymentType"
+            size="mini"
+            clearable
+          >
+            <template slot="append">paid</template>
+          </el-input>
+        </el-row>
+        <el-row>
+          <el-input v-model="form.otherPaymentTerm" size="mini" clearable>
+          </el-input>
+        </el-row>
       </el-form-item>
 
       <el-form-item label="Loading Country/Region">
@@ -709,6 +725,8 @@
           placeholder="请输入标题"
         ></el-input>
         <el-input
+          type="textarea"
+          autosize
           style="width: 75%"
           v-model="item.content"
           placeholder="请输入内容"
@@ -1001,7 +1019,9 @@ export default {
     confirmCompany(companyList, type) {
       var company = companyList[0];
       company.email =
-        company.email && company.email.length > 0 ? company.email[0] : "";
+        company.email && company.email.length > 0
+          ? company.email.join(",")
+          : "";
       company.phoneNumber =
         company.phoneNumber && company.phoneNumber.length > 0
           ? company.phoneNumber[0]

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

@@ -208,12 +208,27 @@
             {{ contract.freightTerms }}
           </el-descriptions-item>
           <el-descriptions-item label="Payment Terms">
-            Deposit Ratio {{ contract.deposit }}%
-            {{ contract.depositDays }} Days after the contract
-            {{ contract.balance }}% balance
-            {{ contract.balancePaymentType }}paid
-            {{ contract.balanceDays }} Days
-            {{ contract.balancePaymentForm }}
+            <div
+              v-if="
+                contract.deposit &&
+                contract.depositDays &&
+                contract.depositPaymentForm &&
+                contract.balance &&
+                contract.balanceDays &&
+                contract.balancePaymentType &&
+                contract.balancePaymentForm
+              "
+            >
+              Deposit Ratio {{ contract.deposit }}%
+              {{ contract.depositDays }} Days
+              {{ contract.depositPaymentForm }} and {{ contract.balance }}%
+              balance {{ contract.balancePaymentType }} paid
+              {{ contract.balanceDays }} Days {{ contract.balancePaymentForm }}
+              {{ contract.otherPaymentTerm }}
+            </div>
+            <div v-else>
+              {{ contract.otherPaymentTerm }}
+            </div>
           </el-descriptions-item>
           <el-descriptions-item label="Price Fixing Option">
             {{ contract.livePriceDays }} Days {{ contract.livePriceForm }} cargo