Merge branch 'master' of http://gogs.langye.net:3000/langye/cz-hjjc-ht

src/components/PlanPicker/index.vue

@@ -110,10 +110,12 @@
 import { getBudget } from "@/api/budget/budget";
 import { listdeptNoAuth } from "@/api/system/department";
 import { getparameterTree } from "@/api/system/dictionary";
+import { getQueryParam } from "@/utils";
 
 export default {
   data() {
     return {
+      myFlowModId: '',
       boxHeight: 0,
       planTypes: [],
       departments: [],
@@ -211,6 +213,8 @@ export default {
       res.list.forEach((item) => (item._inputMoney = 0));
       this.plans = res.list;
       this.planTotal = res.list.total || 0;
+
+      this.toggleBudgetByFlowModId()
     },
 
     getDepartment() {
@@ -271,7 +275,26 @@ export default {
           new_money: i.money,
         })))
       })
-    }
+    },
+
+    getParentFlowModId() {
+      const parentUrl = parent.location.href
+      const splitArr = parentUrl.split('?')
+
+      if (splitArr[1]) {
+        const query = splitArr[1].split('&')
+        this.myFlowModId = query.find(i => /^module_id/.test(i))?.split('=')[1]
+      }
+    },
+    toggleBudgetByFlowModId() {
+      this.$nextTick(_ => {
+        this.plans.forEach(row => {
+          if (row.flow_mod_id == this.myFlowModId) {
+            this.$refs['editorPlanTable']?.toggleRowSelection(row, true)
+          }
+        })
+      })
+    },
   },
   computed: {},
   mounted() {
@@ -281,6 +304,7 @@ export default {
     })
   },
   created() {
+    this.getParentFlowModId()
     window.$getPlans = this.getSelections
     this.getPlanTypes()
     this.getDepartment()

src/views/contract/contractEdit.vue

@@ -920,7 +920,7 @@
       <span slot="footer" class="dialog-footer" style="display: flex;justify-content: flex-end;">
         <el-button @click="step = 2,myPurchaseType = 2,isWeixiu=false,form.is_common_purchase = 1,form.flow_mod_id = 99,showTypes = false,showEdit=true">一般采购</el-button>
          <el-button @click="showTypes = false,myPurchaseType = 1,isWeixiu=true,form.is_common_purchase = 0,step=2,showEdit=true">维修相关</el-button>
-        <el-button type="primary" @click="showTypes = false,isWeixiu=false,myPurchaseType = 1,form.is_common_purchase = 0,showEdit=true">预算计划支出</el-button>
+        <el-button type="primary" @click="showTypes = false,isWeixiu=false,myPurchaseType = 1,form.is_common_purchase = 0,showEdit=true,toggleBudgetByFlowModId()">预算计划支出</el-button>
       </span>
     </el-dialog>
 
@@ -1611,12 +1611,23 @@ export default {
       }
     },
 
+    toggleBudgetByFlowModId() {
+      this.$nextTick(_ => {
+        this.plans.forEach(row => {
+          if (row.flow_mod_id == this.form.flow_mod_id) {
+            this.$refs['editorPlanTable']?.toggleRowSelection(row, true)
+          }
+        })
+      })
+    },
     //获取预算计划
     async getBudgets() {
       let res = await getBudget(this.planSelect);
       res.list.forEach((item) => (item._inputMoney = 0));
       this.plans = res.list;
       this.planTotal = res.list.total || 0;
+
+      this.toggleBudgetByFlowModId()
     },
 
     handleDrawerClose(done) {

src/views/finance/components/examineRegistration.vue

@@ -218,6 +218,7 @@
             >
             </el-option>
           </el-select>
+          <el-date-picker style="width: 160px" size="small" v-model="plansSelect.year" value-format="yyyy" type="year" />
           <el-cascader
             :options="planTypes"
             :props="{
@@ -384,7 +385,8 @@ import {listdeptNoAuth} from "@/api/system/department";
         plansSelect: {
           page: 1,
           page_size: 10,
-          name: ''
+          name: '',
+          year: ''
         },
         planTable: [{
             sortable: false,
@@ -591,8 +593,8 @@ import {listdeptNoAuth} from "@/api/system/department";
         this.paymentRegistrationForm.actMoney = res.apply_money
         this.paymentRegistrationForm.moneyWay = res.money_way_id?.split(',').map(item => Number(item))
 
-        this.getBudgets()
         await this.getContract(res.contract)
+        this.getBudgets(this.paymentRegistrationForm.plan?.map(i => i.plan_id)?.toString())
         await this.moneyWayChange()
       },
 
@@ -625,14 +627,6 @@ import {listdeptNoAuth} from "@/api/system/department";
         //   })
         //   return
         // }
-        console.log({
-          id: this.registrationId,
-          contract_id: this.contract.id,
-          act_money: this.paymentRegistrationForm.actMoney,
-          status: 1,
-          // money_way_id: this.paymentRegistrationForm.moneyWay.toString(),
-          contract_plan_act_links: this.paymentRegistrationForm.plan
-        })
         editorFundLog({
           id: this.registrationId,
           contract_id: this.contract.id,
@@ -656,19 +650,17 @@ import {listdeptNoAuth} from "@/api/system/department";
 
       //计划
       //获取预算计划
-      async getBudgets() {
+      async getBudgets(pid) {
         let res = await getBudget({
-          top_pid: 0,
+          top_pid: 1,
-          ...this.plansSelect
+          ...this.plansSelect,
+          pid
         })
         if (res.list.data) {
-          this.plans = [...this.paymentRegistrationForm.plan.map(i => ({
+          this.plans = res.list.data.map(i => ({
-            use_money: i.use_money,
-            ...i.plan
-          })), ...res.list.data.map(i => ({
             use_money: 0,
             ...i
-          }))].reduce((accumulator, current) => {
+          })).reduce((accumulator, current) => {
             const duplicate = accumulator.find(item => item.id === current.id);
             if (!duplicate) {
               return accumulator.concat([current]);
@@ -727,11 +719,11 @@ import {listdeptNoAuth} from "@/api/system/department";
       toggleSelection(plans) {
         if (plans) {
           this.plans.filter(plan => {
-            if (plans.includes(plan.id)) {
+            if (plans.includes(plan.pid)) {
-              plan.use_money = this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].use_money
+              plan.use_money = this.paymentRegistrationForm.plan[plans.indexOf(plan.pid)].use_money
               return true
             }
-          }).map(row => {
+          }).forEach(row => {
             this.$refs.planTable.toggleRowSelection(row)
           })
         } else {