doctor-admin-components 1.0.14-beta.31 → 1.0.14-beta.33

package/package.json

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

package/packages/index.js

@@ -54,7 +54,9 @@ import {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount
+
 } from "./src";
 // 组件列表
 const components = [
@@ -68,7 +70,8 @@ const components = [
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount
 ];
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，那么所有的组件都会被注册
@@ -141,5 +144,6 @@ export default {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount
 };

package/packages/src/index.js

@@ -2,7 +2,7 @@
  * @Author: error: git config user.name && git config user.email & please set dead value or install git
  * @Date: 2022-07-25 11:24:53
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-07-24 12:09:33
+ * @LastEditTime: 2024-08-23 16:19:29
  * @FilePath: /zpw-com-test/src/lib-components/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -23,6 +23,7 @@ import CompanyBanks from "./views/biz/contractTracing/companyBanks.vue";
 import VDistpicker from "./views/components/RegionPicker/Distpicker.vue";
 import ContractFileDragUpload from '../src/components/FileUpload/contract-drag-new.vue';
 import FileShow from  '../src/views/biz/bizFileInfo/fileShow.vue'
+import ShipmentPurchaseAmount from '../src/views/biz/contractTracing/shipmentPurchaseAmount.vue'
 
 // 为组件提供 install 安装方法，供按需引入
 
@@ -65,6 +66,11 @@ FileShow.install = function (Vue) {
   Vue.component(FileShow.name, FileShow);
 };
 
+ShipmentPurchaseAmount.install = function (Vue) {
+  Vue.component(ShipmentPurchaseAmount.name, ShipmentPurchaseAmount);
+};
+
+
 // 导出组件
 export {
   EditBill,
@@ -76,5 +82,6 @@ export {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount
 };

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

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2023-07-31 17:40:56
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-08-23 14:27:23
+ * @LastEditTime: 2024-08-23 15:57:00
  * @FilePath: /doctor-admin-components/packages/src/views/biz/contractTracing/chargingDialog.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -22,7 +22,7 @@
               <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">{{item.askName}};</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="净量(MT)" prop="goodsNetWeight">
+          <el-table-column align="center" label="净重(MT)" prop="goodsNetWeight">
               <template slot-scope="{ row }">
                 <div style="white-space: pre-line !important" v-for="(item, index) in getColumnPropArray(row)" :key="index">
                   <span :style="item.goodsNetWeight != item.purchaseActualNetWeight ? 'color:red' : ''">{{$formatNumber(item.goodsNetWeight, 3)}};</span>
@@ -206,28 +206,28 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="本次剩余定金:">
-              <el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣，不会随着下次的抵扣行为刷新，可为负数" placement="top">
+            <el-form-item label="总剩余定金:">
+              <el-tooltip class="ml10" effect="dark" content="当前时间该合同还剩余多少定金可以用于抵扣，随着每次的抵扣行为实时刷新，可为负数" placement="top">
                 <span>
-                  <span v-if="form.thisRemainingDeposit == null">$0</span>
+                  <span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
                   <span v-else>
-                    $ {{  $formatNumber(form.thisRemainingDeposit || 0, 2) }}
+                    $ {{  $formatNumber(form.purchaseDepositBalanceAmount || 0 ,2) }}
                   </span>
-                  <i class="el-icon-question"></i>
-                </span>
+                   <i class="el-icon-question"></i>
+                 </span>
                 </el-tooltip>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="总剩余定金:">
-              <el-tooltip class="ml10" effect="dark" content="当前时间该合同还剩余多少定金可以用于抵扣，随着每次的抵扣行为实时刷新，可为负数" placement="top">
+            <el-form-item label="本次剩余定金:">
+              <el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣，不会随着下次的抵扣行为刷新，可为负数" placement="top">
                 <span>
-                  <span v-if="form.purchaseDepositBalanceAmount == null">$0</span>
+                  <span v-if="form.thisRemainingDeposit == null">$0</span>
                   <span v-else>
-                    $ {{  $formatNumber(form.purchaseDepositBalanceAmount || 0 ,2) }}
+                    $ {{  $formatNumber(form.thisRemainingDeposit || 0, 2) }}
                   </span>
-                   <i class="el-icon-question"></i>
-                 </span>
+                  <i class="el-icon-question"></i>
+                </span>
                 </el-tooltip>
             </el-form-item>
           </el-col>