doctor-admin-components 1.0.9 → 1.0.11

package/package.json

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

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

@@ -183,9 +183,11 @@ export default {
       if (this.lang == 'zh') {
         lang = 'zh-CN'
       }
-
+      const encryptedContractId = this.$encryptId(this.contract.contractId)
+      const encryptedDealId = this.$encryptId(this.contract.dealId)
+      
       window.open(
-        `${url}${this.contract.dealId}&contractId=${this.contract.contractId}&language=${lang}`
+        `${url}${this.contract.dealId}&contractId=${this.contract.contractId}&language=${lang}&encryptedContractId=${encryptedContractId}&encryptedDealId=${encryptedDealId}`
       );
     },
     /**

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

@@ -11,7 +11,7 @@
               : "")
           }}
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="channel !== 'official-website'" :span="12">
           <div
             v-if="
               contract.contractSignTime &&
@@ -237,7 +237,7 @@
             <el-table-column
               prop="askName"
               :label="$t('contractDetail.askName')"
-              width="100"
+              :width="channel === 'official-website' ? 200 : 100"
             >
             </el-table-column>
             <el-table-column
@@ -261,13 +261,13 @@
             <el-table-column
               prop="descriptions"
               :label="$t('contractDetail.description')"
-              width="160"
+              :width="channel === 'official-website' ? 200 : 160"
             >
             </el-table-column>
             <el-table-column
               prop="weight"
               :label="$t('contractDetail.weight')"
-              width="90px"
+              width="120px"
             >
             </el-table-column>
             <el-table-column
@@ -292,6 +292,7 @@
               prop="quotePrice"
               :label="$t('contractDetail.quotePrice')"
               width="120"
+              :width="channel === 'official-website' ? 180 : 120"
             >
               <template slot-scope="scope">
                 <span v-if="dealRecord.quoteType == 'FIXED'">
@@ -308,7 +309,7 @@
             <el-table-column
               prop="totalQuote"
               :label="$t('contractDetail.totalQuote')"
-              width="120"
+              :width="channel === 'official-website' ? 180 : 120"
             >
             </el-table-column>
           </el-table>
@@ -388,12 +389,14 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column
+            v-if="channel !== 'official-website'"
             label="未付/未收金额"
             align="center"
             prop="remainingAmount"
             width="120"
           />
           <el-table-column
+            v-if="channel !== 'official-website'"
             label="已付/已收金额"
             align="center"
             prop="remainingAmount"
@@ -404,11 +407,39 @@
             </template>
           </el-table-column>
           <el-table-column
+            v-if="channel !== 'official-website'"
             label="总金额"
             align="center"
             prop="amount"
             width="100"
           />
+
+          <!-- 官网 -->
+          <el-table-column
+            v-if="channel == 'official-website'"
+            :label="$t('contract.Payable_Amount')"
+            align="center"
+            prop="amount"
+            width="100"
+          />
+          <el-table-column
+            v-if="channel == 'official-website'"
+            :label="$t('contract.Amount_Paid')"
+            align="center"
+            prop="amount"
+            width="100"
+          >
+            <template slot-scope="{ row }">
+              {{ row.amount - row.remainingAmount }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="channel == 'official-website'"
+            :label="$t('contract.Balance_Due')"
+            align="center"
+            prop="remainingAmount"
+            width="100"
+          />
           <el-table-column
             :label="$t('contractDetail.quoteType')"
             align="center"
@@ -601,6 +632,9 @@
                 class-name="small-padding fixed-width"
                 width="150px"
               >
+              <template slot-scope="scope">
+                <el-button size="mini" type="primary" @click.stop="activeNameFun(scope.$index)">{{ $t('contract.Track_Shipment') }}</el-button>
+              </template>
               </el-table-column>
             </el-table>
 
@@ -1004,6 +1038,9 @@ ETA: ${eta}
         });
       });
     },
+    activeNameFun(v) {
+      this.activeName = "" + v;
+    },
   },
 };
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2023-07-20 17:13:54
  * @LastEditors: zhangpengwei 15038779532@163.com
- * @LastEditTime: 2023-08-11 17:50:13
+ * @LastEditTime: 2023-08-15 10:25:31
  * @FilePath: /recycle-vue-ui再生博士后台管理/src/views/biz/contractTracing/contractTracingDetail.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->