Merge remote-tracking branch 'origin/master'

src/views/inOut/component/addExpenseAccount.vue

@@ -135,9 +135,7 @@
       <template v-slot:oa>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red; font-weight: 600; padding-right: 4px"
+            关联审批单
-              >*</span
-            >关联审批单
           </div>
           <div class="xy-table-item-content">
             <div
@@ -274,8 +272,8 @@ export default {
       budgetTotal: 0,
       budgetSelect: {
         name: "",
-        top_pid: '',
+        top_pid: "1",
-        is_tree: 1,
+        is_tree: "0",
         page: 1,
         page_size: 10
       },
@@ -328,7 +326,8 @@ export default {
         files: [],
         remark: "",
         oa: [],
-        plan_link: []
+        plan_link: [],
+        has_act_links:1
       },
       rules: {
         report_type: [
@@ -600,7 +599,7 @@ export default {
     },
     async getBudgets() {
       let res = await getBudget(this.budgetSelect)
-      this.budgets = res.list
+      this.budgets = res.list.data;
 
       this.toggleSelection(this.form.plan_link.map(item => {
         return item.plan_id

src/views/inOut/expenseAccount.vue

@@ -189,7 +189,8 @@
       <template #btns>
         <el-table-column label="操作" width="220" fixed="right">
           <template #default="scope">
-            <Button
+
+            <!--<Button
               class="slot-btns-item"
               size="small"
               type="primary"
@@ -201,8 +202,10 @@
               "
             >
               付款登记
-            </Button>
+            </Button>-->
-            <template v-if="!scope.row.status === 2">
+
+
+            <template >
               <Poptip
                 :transfer="true"
                 confirm
@@ -215,7 +218,7 @@
                 </i-button>
               </Poptip>
             </template>
-            <Button
+           <!-- <Button
               style="margin-left: 4px"
               size="small"
               type="primary"
@@ -225,7 +228,7 @@
               "
             >
               查看
-            </Button>
+            </Button> -->
             <template v-if="scope.row.status != 2">
               <Button
                 style="margin-left: 4px"
@@ -336,11 +339,11 @@ export default {
             );
           },
         },
-        {
+        // {
-          prop: "from",
+        //   prop: "from",
-          label: "资金来源",
+        //   label: "资金来源",
-          width: 160,
+        //   width: 160,
-        },
+        // },
         {
           prop: "money",
           label:
@@ -355,7 +358,7 @@ export default {
               .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
           }
         },
-        {
+      /*  {
           prop: "apply_money_total",
           label:
             this.$route.path.split("_")[1] == 2
@@ -379,17 +382,34 @@ export default {
               .toFixed(2)
               .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
           },
+        }, */
+        {
+          label: "预算计划",
+          width: 330,
+          align: "left",
+          customFn: (row) => {
+            {
+              return row.plans.map((item) => {
+                return (
+                  <div>
+                    {" "}
+                    [{item.year}] {item.pid_info ? item.pid_info.name : ''} - {item.name}{" "}
+                  </div>
+                );
+              });
+            }
+          },
         },
         {
           prop: "department.name",
           label: "业务科室",
           width: 140,
         },
-        {
+        /* {
           prop: "",
           label: "状态",
           width: 140,
-        },
+        }, */
         {
           prop: "admin.name",
           label: "经办人",

vue.config.js

@@ -26,7 +26,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: './dist',
+  outputDir: '/Users/mac/Documents/Work/s-苏州环境监测中心/code/hjjc-workbench-service/public/admin/',
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,