doctor-admin-components 1.0.13-pro.1 → 1.0.14-beta.1

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

@@ -65,7 +65,23 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item
-              label="金额($)"
+              label="发票金额($)"
+              :prop="'proFormInvoiceList.' + index + '.invoiceAmount'"
+              :rules="[
+                { required: true, message: '不能为空' },
+                { type: 'number', message: '必须为数字值' },
+              ]"
+            >
+              <el-input
+                v-model.number="dt.invoiceAmount"
+                clearable
+                size="small"
+                placeholder="请输入票面金额"
+                type="number"
+              />
+            </el-form-item>
+            <el-form-item
+              label="应付金额($)"
               :prop="'proFormInvoiceList.' + index + '.amount'"
               :rules="[
                 { required: true, message: '不能为空' },
@@ -95,6 +111,7 @@
                 <upload-invoice v-model="dt.invoiceFileList" :limit="20" />
               </el-form-item>
             </el-row>
+            <company-banks ref="companyBanks" :companyId="companyId" @selectBank="(data) => selectBank(index, 'ProForma', data)"></company-banks>
           </el-row>
         </el-card>
         <el-row />
@@ -168,7 +185,23 @@
             </el-form-item>
             <el-row>
               <el-form-item
-                label="金额($)"
+                label="发票金额($)"
+                :prop="'fixedInvoiceList.' + index + '.invoiceAmount'"
+                :rules="[
+                  { required: true, message: '不能为空' },
+                  { type: 'number', message: '必须为数字值' },
+                ]"
+              >
+                <el-input
+                  v-model.number="item.invoiceAmount"
+                  clearable
+                  size="small"
+                  placeholder="请填写票面金额"
+                  type="number"
+                />
+              </el-form-item>
+              <el-form-item
+                label="应付金额($)"
                 :prop="'fixedInvoiceList.' + index + '.amount'"
                 :rules="[
                   { required: true, message: '不能为空' },
@@ -183,6 +216,13 @@
                   type="number"
                 />
               </el-form-item>
+              <div class="balance-money" v-if="purchaseBalanceMoney && purchaseBalanceMoney != item.amount">
+                 <span class="balance-money-text">提示：系统计算的尾款为${{ purchaseBalanceMoney }}</span>
+                 <span @click.stop="dialogVisibleConfirm" class="balance-money-click">
+                   <img  class="balance-money-icon" src="../../../assets/images/click-show-table.png" alt="">
+                   <span style="color:#3e82f4">点击这里去校准</span>
+                 </span>
+              </div>
               <el-form-item label="备注">
                 <el-input
                   v-model="item.remark"
@@ -200,12 +240,13 @@
               </el-form-item>
             </el-row>
             <el-divider></el-divider>
+            <company-banks ref="companyBanks" :companyId="companyId" @selectBank="(data) => selectBank(index, 'Fixed', data)"></company-banks>
           </el-row>
         </el-card>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button @click="submitForm">仅上传</el-button>
+        <el-button type="primary" @click="submitForm">确认上传</el-button>
         <el-button
           v-if="type == 'deposit'"
           type="primary"
@@ -213,6 +254,19 @@
           >上传并生成收付款</el-button
         >
       </div>
+      <el-dialog
+        title="系统计算金额和发票金额不一致"
+        :visible.sync="dialogVisible"
+        :modal="false"
+        width="30%"
+        :close-on-click-modal="false"
+        :before-close="handleClose">
+        <span>系统检测到您填写的发票金额和系统计算的金额不一致，有可能存在发票金额填写错误或者系统计算的定金扣减不符合业务情况。若系统计算有误，请先校准修正系统数据，以免影响财务对账。</span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisibleCancel">忽略并确认上传</el-button>
+          <el-button type="primary" @click="dialogVisibleConfirm">去校准</el-button>
+        </span>
+      </el-dialog>
     </el-dialog>
   </div>
 </template>
@@ -232,10 +286,28 @@ import {
   getInvoiceListByShipmentId,
 } from "../../../api/biz/bizInvoice";
 import { getByContractId } from "../../../api/biz/bizShipment";
+import CompanyBanks from './companyBanks.vue';
 
 export default {
   name: "PurchaseInvoiceUpload",
-  components: { UploadInvoice },
+  components: { 
+    UploadInvoice,
+    CompanyBanks
+   },
+  props: {
+    // 合同公司id（目前是合同id）
+    companyId: {
+      type: String | Number,
+      default: null,
+    },
+    purchaseBalanceMoneyProp: {
+      type: Number | String,
+      default: '',
+    },
+    getShipmentPurchaseFun:{
+      type: Function
+    }
+  },
   data() {
     return {
       test: null,
@@ -246,17 +318,50 @@ export default {
       // 是否显示弹出层
       open: false,
       // 表单参数
-      form: { proFormInvoiceList: [], fixedInvoiceList: [] },
+      form: { 
+        proFormInvoiceList: [], 
+        fixedInvoiceList: [],
+      },
       //销售合同选项表
       saleContractList: [],
       //采购合同选项表
       purchaseContractList: [],
       type: null,
       shipmentId: null,
+      dialogVisible: false,
+      purchaseBalanceMoney: '',
     };
   },
-  created() {},
+  created() {
+    console.log('companyId:', this.companyId)
+  },
   methods: {
+    dialogVisibleCancel() {
+      this.submitForm(false);
+      this.dialogVisible = false;
+    },
+    dialogVisibleConfirm() {
+      this.getShipmentPurchaseFun && this.getShipmentPurchaseFun(this.form)
+      this.dialogVisible = false;
+    },
+    /**
+     * @description: 确认弹窗
+     * @param {*} done
+     * @return {*}
+     */
+    handleClose() {
+      this.dialogVisible = false;
+    },
+    // 选择收款账户
+    selectBank(index, fixed, data) {
+      console.log('proFormInvoiceList', this.form.proFormInvoiceList);
+      console.log('fixedInvoiceList', this.form.fixedInvoiceList);
+      if (fixed == 'ProForma') {
+        this.form.proFormInvoiceList[index].accountId = data?.accountId
+      } else {
+        this.form.fixedInvoiceList[index].accountId = data?.accountId
+      }
+    },
     //上传并生成
     uploadAndGenerate() {
       this.$refs["form"].validate((valid) => {
@@ -276,10 +381,16 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm(comfirmClickFlag) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          console.log('type', this.type);
           if (this.type == "finally") {
+            if(comfirmClickFlag) {
+              if(this.form.fixedInvoiceList[0].amount && this.purchaseBalanceMoney && this.form.fixedInvoiceList[0].amount != this.purchaseBalanceMoney) {
+                return this.dialogVisible = true;
+              }
+            }
             uploadFinallyInvoice(this.form).then((response) => {
               this.$modal.msgSuccess("保存成功");
               this.$emit("refresh");
@@ -310,9 +421,11 @@ export default {
     },
     /** 展示按钮操作 */
     handleUpload(row, type, shipmentId) {
+      console.log('row:', row)
       this.reset();
       this.type = type;
       this.shipmentId = shipmentId;
+      this.companyId = row.contractId
       if (type == "finally") {
         getInvoiceListByShipmentId(shipmentId)
           .then((response) => {
@@ -379,5 +492,38 @@ export default {
       }
     },
   },
+  watch: {
+    purchaseBalanceMoneyProp: {
+      handler(val){
+        this.purchaseBalanceMoney = val;
+      },
+      immediate: true,
+      deep: true
+    },
+  }
 };
 </script>
+<style lang="scss" scoped>
+.balance-money {
+    display:flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-bottom: 20px;
+    .balance-money-text {
+        font-size: 12px;
+        color: #f00;
+    }
+    .balance-money-click {
+        cursor: pointer;
+        .balance-money-icon {
+            width: 20px;
+            height: 20px;
+            cursor: pointer;
+            vertical-align: sub;
+            margin-right:5px;
+        }
+    }
+  }
+
+
+</style>

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

@@ -1,3 +1,11 @@
+<!--
+ * @Author: zhangpengwei 15038779532@163.com
+ * @Date: 2023-07-31 17:40:56
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-04-02 17:58:33
+ * @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
+-->
 <template>
   <div class="app-container">
     <!-- 合同争议详情对话框 -->
@@ -124,6 +132,11 @@ export default {
       contract: null
     }
   },
+  props: {
+    getContractFileInfoCallback: {
+      type: Function
+    }
+  },
   created() {},
   mounted() {},
   methods: {
@@ -147,6 +160,7 @@ export default {
               type: 'success',
               message: '修改成功'
             })
+            this.getContractFileInfoCallback && this.getContractFileInfoCallback()
           })
         })
         .catch(() => {

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

@@ -131,7 +131,7 @@
 </template>
 
 <script>
-import { Form } from 'element-ui'
+import { Form, Loading } from 'element-ui'
 import { listBizContractCompany, delBizContractCompany, updateBizContractCompany } from '../../../api/biz/bizContractCompany'
 import AddSubCompany from './addSubCompany'
 
@@ -189,7 +189,7 @@ export default {
     },
     /** 查询合同公司记录列表 */
     getList() {
-      const loading = this.$loading({
+      const loading = Loading.service({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
@@ -278,3 +278,9 @@ export default {
   margin-top: 5px;
 }
 </style>
+<style>
+.el-message-box__wrapper {
+  z-index: 9999 !important;
+}
+
+</style>