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

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

@@ -12,31 +12,22 @@
       <div class="app-container-left">
         <div class="contract-number">
           <div>{{ $t('contractDetail.Contract_No') }}</div>
-          <div>{{ contract.contractNo }}</div>
+          <div style="word-wrap: break-word;">{{ contract.contractNo }}</div>
         </div>
         <div class="contract-number">
           <div>
             <span>{{$t('contractDetail.Reference_No')}}</span>
             <el-button size="mini" type="text" icon="el-icon-edit" @click="clickEditReference"></el-button>
           </div>
-          <div>{{ contract.reference  || '--' }}</div>
+          <div style="word-wrap: break-word;">{{ contract.reference  || '--' }}</div>
         </div>
         <div class="tab-root">
           <div :class="['tab', activeName == tabsItem.name ? 'active' : '']" v-for="tabsItem in saleTabsArr" :key="tabsItem.id" @click="changeTabs(tabsItem)">
             {{ tabsItem.label }}
           </div>
         </div>
-        <div>
-          <!-- 选择项 -->
-          <div class="selection-root">
-            <span>{{ $t('contractDetail.Selected') }} {{ selectFileList.length }} {{ $t('contractDetail.item') }}</span>
-            <div class="border-button" @click.stop="downLoadAll">{{ $t('contractDetail.Download_All') }}</div>
-            <div class="border-button" @click.stop="deleteAll">{{ $t('contractDetail.Delete_All') }}</div>
-            <div class="border-button" @click.stop="cancelAll">{{ $t('contractDetail.Deselect') }}</div>
-          </div>
-        </div>
       </div>
-      <div class="app-container-right">
+      <div class="app-container-right" :style="activeName == 'fourth' ? 'overflow:visible' : 'overflow:auto'">
         <contract-summary v-if="activeName == 'first'" :channel="channel"></contract-summary>
         <contract-info v-if="activeName == 'second'" :channel="channel"></contract-info>
         <!-- 提单指令 -->
@@ -54,7 +45,6 @@
           :contract="contract"
           :channel="channel"
           :buyerFlag="buyerFlag"
-          :selectFileListProp="selectFileList"
           ref="contractFileRef"
         ></contract-file>
       </div>
@@ -106,7 +96,6 @@ import ContractSummary from './contractSummary.vue'
 import BillInfo from './billInfo.vue'
 import ContractFile from '../bizFileInfo/contract.vue'
 import ContractInfo from './contractInfo.vue'
-import { delBizFileInfo } from '../../../api/biz/bizFileInfo'
 
 export default {
   name: 'ContractTracingDetail',
@@ -165,7 +154,6 @@ export default {
         }
       ],
 
-      selectFileList: [],
       // 提单指令列表
       blList: null,
       activeBillIndex: null
@@ -205,46 +193,7 @@ export default {
           console.log(e)
         })
     },
-    /**
-     * @description: 取消全部选择
-     * @return {*}
-     */
-    cancelAll() {
-      this.$refs.contractFileRef.cancelAllSelectFileList()
-    },
-
-    /**
-     * @description: 全部下载
-     * @return {*}
-     */
-    downLoadAll() {
-      if (this.selectFileList.length == 0) {
-        return this.$message.warning(this.$t('contractDetail.please_select_file'))
-      }
-      this.$refs.contractFileRef.downloadZip()
-    },
-    deleteAll() {
-      console.log('==delBizFileInfo==', this.selectFileList)
-      if (this.selectFileList.length == 0) {
-        return this.$message.warning(this.$t('contractDetail.please_select_file'))
-      }
-
-      this.$confirm('是否删除选中文件', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          const ids = this.selectFileList.map((item) => item.fileId)
-          delBizFileInfo(ids).then(() => {
-            this.$message.success('删除成功')
-            this.$refs.contractFileRef.handleRefresh()
-          })
-        })
-        .catch(() => {
-          this.$message.info('已取消删除')
-        })
-    },
+    
     /**
      * @description: 切换tab
      * @param {*} tab
@@ -329,29 +278,8 @@ export default {
       height: 100%;
       overflow: auto;
     }
+    
   }
 }
 
-.selection-root {
-  margin-top: 26px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 20px;
-}
-
-.border-button {
-  margin-top: 10px;
-  padding: 0 10px;
-  width: max-content;
-  height: 21px;
-  text-align: center;
-  line-height: 17px;
-  background: #ffffff;
-  border-radius: 11px;
-  font-size: 12px;
-  border: 2px solid #d1d3d4;
-  cursor: pointer;
-}
 </style>

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

@@ -157,22 +157,22 @@
               <el-collapse-item name="3">
                 <template slot="title">
                   <el-row style="width: 75%">
-                    <el-form-item class="mt20" :label="$t('contract.secondNotifier') + ':'">{{ 'TTYY INTERNATIONAL LIMITED' }}</el-form-item>
+                    <el-form-item class="mt20" :label="$t('contract.secondNotifier') + ':'">{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.companyName : "" }}</el-form-item>
                   </el-row>
                 </template>
                 <el-form-item :label="$t('contract.taxId') + ':'">
-                  {{ '73855725-000-23-0' }}
+                  {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.taxNumber : "" }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.notifierAddress') + ':'">
-                  {{ 'FLAT/RM 07, 12/F, CHEVALIER COMMERCIAL CENTRE, 8 WANG HOI ROAD, KOWLOON BAY' }}
+                  {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.address : "" }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.contact') + ':'">
-                  {{ 'Ms. Zhou' }}
+                  {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.contactPerson : "" }}
                 </el-form-item>
                 <el-form-item :label="$t('contract.phoneNumber') + ':'">
-                  {{ '00-852 53816912' }}
+                  {{ secondNotifyInfoInfo ? secondNotifyInfoInfo.phoneNumber : "" }}
                 </el-form-item>
-                <el-form-item :label="$t('contract.email') + ':'">{{ 'info@tyzltech.com' }}</el-form-item>
+                <el-form-item :label="$t('contract.email') + ':'">{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.email : ""  }}</el-form-item>
               </el-collapse-item>
             </el-collapse>
 
@@ -288,7 +288,7 @@ import { listBizContractCompany } from '../../../api/biz/bizContractCompany'
 import SubCompanyDialog from './subCompanyDialog.vue'
 import BillGoods from './billGoods.vue'
 import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods'
-import { getBizContract, changeBizStatus } from '../../../api/biz/bizContract'
+import { getBizContract, changeBizStatus, getSecondNotifyInfo } from '../../../api/biz/bizContract'
 import FileUpload from '../../../components/FileUpload/s3.vue'
 
 export default {
@@ -336,7 +336,8 @@ export default {
         notifierCompanyId: [{ required: true, trigger: 'blur', message: this.$t('bill.tip4') }],
         goodsName: [{ required: true, trigger: 'blur' }]
       },
-      contract: null
+      contract: null,
+      secondNotifyInfoInfo: null
     }
   },
   watch: {
@@ -367,7 +368,9 @@ export default {
       }
     }
   },
-  created() {},
+  created() {
+    this.getSecondNotifyInfo();
+  },
   methods: {
     async handleEdit(contractId, dealId) {
       const loading = this.openLoading()
@@ -597,7 +600,12 @@ export default {
           }
         }
       })
-    }
+    },
+    getSecondNotifyInfo() {
+      getSecondNotifyInfo().then((res) => {
+        this.secondNotifyInfoInfo = res.data;
+      })
+    },
   }
 }
 </script>

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

@@ -0,0 +1,103 @@
+<!--
+ * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @Date: 2024-08-20 10:37:30
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-08-23 13:49:18
+ * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/contractTracing/queryDeductionRecords.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+    <el-dialog
+      title="定金扣减记录"
+      :visible.sync="dialogVisible"
+      width="1200px"
+      :modal="false"
+     >
+      <el-table 
+        :data="tableList"
+        :cell-style="{'text-align': 'center'}"
+        :header-cell-style="{'text-align': 'center'}"
+      >
+        <el-table-column
+          prop="billOfLadingNo"
+          label="提单号"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="containerNumber"
+          label="柜数"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositTotalAmount"
+          label="定金总额">
+          <template slot-scope="{ row }">
+            {{ row.purchaseDepositTotalAmount ? "$" +  $formatNumber(row.purchaseDepositTotalAmount, 2) : '0' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositBalance"
+          label="上次剩余定金">
+            <template slot-scope="{ row }">
+                {{ row.purchaseDepositBalance ? "$" +  $formatNumber(row.purchaseDepositBalance,2) : '0' }}
+            </template>
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositAmount"
+          label="扣减定金">
+          <template slot-scope="{ row }">
+            <span class="edit-style" v-if="row.purchaseDepositAmount" @click.stop="jumpFileManage(row)">{{ row.purchaseDepositAmount ? "$" +  $formatNumber(row.purchaseDepositAmount, 2) : '0' }}</span>
+            <span v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="purchaseDepositRemainAmount"
+          label="定金余额">
+            <template slot-scope="{ row }">
+                {{ row.purchaseDepositRemainAmount ? "$" +  $formatNumber(row.purchaseDepositRemainAmount, 2) : '0' }}
+            </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+</template>
+
+<script>
+import { deductionRecords } from '../../../api/biz/bizShipment'
+
+export default {
+  name: 'DoctorAdminComponentsQueryDeductionRecords',
+
+  data() {
+    return {
+        tableList:[],
+        dialogVisible: false
+    };
+  },
+
+  mounted() {
+    
+  },
+
+  methods: {
+    handlerOpen(shipmentId) {
+        this.dialogVisible = true
+        deductionRecords({shipmentId}).then((res) => {
+            this.tableList = res.rows
+        })
+    },
+    jumpFileManage(row) {
+        window.open(`/contract/tracing/detail/${row.purchaseContractId}?activeName=fourth&deductionRecordsShipmentId=${row.shipmentId}`)
+    }
+
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.edit-style {
+  cursor: pointer;
+  color: #409eff;
+}
+
+</style>