doctor-admin-components 1.0.13-beta.85 → 1.0.13-beta.88

package/package.json

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

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

@@ -252,7 +252,9 @@
           }}</el-form-item>
           <el-form-item v-else :label="'EXW Address' + ':'">{{ contract.exw }}</el-form-item>
 
-          <el-form-item :label="$t('contract.terminal') + ':'">{{ form.terminal }}</el-form-item>
+          <el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contract.terminal') + ':'">{{
+            form.terminal
+          }}</el-form-item>
 
           <el-form-item :label="$t('contract.shippingMarks') + ':'">{{ form.shippingMark }}</el-form-item>
 
@@ -556,8 +558,10 @@ export default {
       // this.reset()
       // getBizDealRecordByAskId(askId).then((response) => {
       // this.form = response.data
-      if (this.form.buyerCompanyBillGoods && typeof this.form.buyerCompanyBillGoods === String) {
-        this.form.buyerCompanyBillGoods = JSON.parse(this.form.buyerCompanyBillGoods)
+      if (this.form.buyerCompanyBillGoods) {
+        if (typeof this.form.buyerCompanyBillGoods === 'string') {
+          this.form.buyerCompanyBillGoods = JSON.parse(this.form.buyerCompanyBillGoods)
+        }
       } else {
         this.form.buyerCompanyBillGoods = []
         this.addBillGoods()

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

@@ -101,7 +101,8 @@
               <el-form-item :label="$t('contractDetail.paymentType')">{{ dealRecord.paymentType }}</el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('contractDetail.destination')">{{ dealRecord.buyerDestination }}</el-form-item>
+              <el-form-item v-if="dealRecord.paymentType != 'EXW'" :label="$t('contractDetail.destination')">{{ dealRecord.buyerDestination }}</el-form-item>
+              <el-form-item v-else label="EXW">{{ dealRecord.exw }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -338,10 +339,9 @@
                   >
                   <!-- v-if="channel == 'official-website' && scope.row.showFallbackQuality" -->
                   <el-button
-                    v-if="
-                      channel == 'official-website'"
+                    v-if="channel == 'official-website'"
                     size="mini"
-                    :type="scope.row.showFallbackQuality ? 'primary': 'info'"
+                    :type="scope.row.showFallbackQuality ? 'primary' : 'info'"
                     style="padding-left: 5px; padding-right: 5px"
                     @click.stop="qualityFeedback(scope.row)"
                     >{{ $t('contract.Quality_Feedback') }}</el-button
@@ -552,10 +552,10 @@ export default {
      * @return {*}
      */
     qualityFeedback(row) {
-      this.$buryingPoint({ data: { funcKey: 'click_feedback' } });
-      if(!row.showFallbackQuality) {
-        this.$message.warning(this.$t('contract.No_quality_feedback'));
-        return;
+      this.$buryingPoint({ data: { funcKey: 'click_feedback' } })
+      if (!row.showFallbackQuality) {
+        this.$message.warning(this.$t('contract.No_quality_feedback'))
+        return
       }
 
       this.$store.commit('setBillNoInfo', {

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

@@ -182,7 +182,7 @@
             <el-form-item v-else :label="'EXW Address' + ':'">
               {{ this.contract && this.contract.exw ? this.contract.exw : '' }}
             </el-form-item>
-            <el-form-item :label="$t('contract.terminal') + ':'" prop="terminal">
+            <el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contract.terminal') + ':'" prop="terminal">
               <el-input v-model="form.terminal" type="textarea" autosize :placeholder="$t('contract.terminalTip')"></el-input>
             </el-form-item>