1

src/components/XyDialog/index.vue

@@ -9,7 +9,7 @@ export default {
     },
     width:{
       type:Number,
-      default:55
+      default:58
     },
     isShow:{
       type:Boolean,

src/views/contract/contractEdit.vue

@@ -1303,7 +1303,7 @@ export default {
               });
               return;
             }
-            if (i._inputMoney > ((Number(i.money) || Number(i.update_money)) - Number(i.has_money_total))) {
+            if ((i._inputMoney > ((Number(i.money) || Number(i.update_money)) - Number(i.has_money_total))) || (i._inputMoney > ((Number(i.money) || Number(i.update_money)) - Number(i.use_money_total)))) {
               this.$message({
                 type: "warning",
                 message: `【${i.year}】${i.name} 使用金额大于剩余预算！`,

src/views/finance/components/examineRegistration.vue

@@ -174,12 +174,13 @@
       </template>
       <template v-slot:extraFormBottom>
         <div style="display: flex;align-items: center;">
+          <el-date-picker type="year" v-model="plansSelect.year" value-format="yyyy" style="width: 144px;" size="small"></el-date-picker>
           <el-select
             placeholder="科室选择"
             clearable
             size="small"
             v-model="plansSelect.plan_department_id"
-            style="width: 160px"
+            style="width: 160px;margin-left: 6px;"
           >
             <el-option
               v-for="item in departments"
@@ -343,7 +344,8 @@ import { listdeptNoAuth } from '@/api/system/department'
           page_size: 10,
           name: '',
           plan_department_id: "",
-          type: ""
+          type: "",
+          year: new Date().getFullYear().toString()
         },
         planTable: [
           {
@@ -643,6 +645,7 @@ import { listdeptNoAuth } from '@/api/system/department'
     watch: {
       isShow(newVal) {
         if (!newVal) {
+          this.plansSelect.year = new Date().getFullYear().toString()
           this.paymentRegistrationForm.actMoney = ''
           this.paymentRegistrationForm.moneyWay = ''
           this.paymentRegistrationForm.plan = []