From 1e487a42549384f6e937a5c7d557563aedafec2c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 20 三月 2024 18:41:29 +0800
Subject: [PATCH] 11

---
 src/views/project/financesubject/index.vue |  375 ++++++++++++++---------------------------------------
 1 files changed, 102 insertions(+), 273 deletions(-)

diff --git a/src/views/project/financesubject/index.vue b/src/views/project/financesubject/index.vue
index 158afb4..210c95c 100644
--- a/src/views/project/financesubject/index.vue
+++ b/src/views/project/financesubject/index.vue
@@ -1,323 +1,151 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="椤圭洰绫诲瀷" prop="itemtype">
-        <el-select
-          v-model="queryParams.itemtype"
-          placeholder="璇烽�夋嫨椤圭洰绫诲瀷"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_ConsolationType"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.itemtype" placeholder="璇烽�夋嫨椤圭洰绫诲瀷" clearable size="small">
+          <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="椤圭洰鍚嶇О" prop="itemname">
-        <el-input
-          v-model="queryParams.itemname"
-          placeholder="璇疯緭鍏ラ」鐩悕绉�"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.itemname" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="鍚敤鐘舵��" prop="usestate">
-        <el-select
-          v-model="queryParams.usestate"
-          placeholder="璇烽�夋嫨鍚敤鐘舵��"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_0_1"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.usestate" placeholder="璇烽�夋嫨鍚敤鐘舵��" clearable size="small">
+          <el-option v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >鎼滅储</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >閲嶇疆</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['project:financesubject:add']"
-          >鏂板</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['project:financesubject:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['project:financesubject:edit']"
-          >淇敼</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['project:financesubject:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['project:financesubject:remove']"
-          >鍒犻櫎</el-button
-        >
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['project:financesubject:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['project:financesubject:export']"
-          >瀵煎嚭</el-button
-        >
+        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport"
+          v-hasPermi="['project:financesubject:export']">瀵煎嚭</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="financesubjectList"
-      @selection-change="handleSelectionChange"
-      border
-    >
+    <el-table v-loading="loading" :data="financesubjectList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="鎴愭湰绫诲瀷"
-        width="220"
-        align="center"
-        prop="costtypename"
-      />
-      <el-table-column
-        label="璐圭敤绫诲瀷"
-        width="220"
-        align="center"
-        prop="expensetypename"
-      />
-      <el-table-column
-        label="绉戠洰绫诲瀷"
-        width="220"
-        align="center"
-        prop="subjecttypename"
-      />
-      <el-table-column
-        label="椤圭洰绫诲瀷"
-        width="220"
-        align="center"
-        prop="itemtypename"
-      >
-      </el-table-column>
-
-      <el-table-column
-        label="椤圭洰鍚嶇О"
-        width="300"
-        align="left"
-        prop="itemname"
-      />
-      <el-table-column
-        label="椤圭洰鍗曚綅"
-        width="80"
-        align="center"
-        prop="itemunit"
-      />
-      <el-table-column
-        label="椤圭洰鎻忚堪"
-        width="300"
-        align="left"
-        prop="itemdescribe"
-      />
-      <el-table-column
-        label="鍚敤鐘舵��"
-        width="80"
-        align="center"
-        prop="usestate"
-      >
+      <el-table-column label="鏈嶅姟椤圭洰鎴愭湰鍒嗙被" width="220" align="center" prop="subjecttypename" />
+      <el-table-column label="鏈嶅姟绫诲瀷" width="220" align="center" prop="itemtypename" />
+      <el-table-column label="鏈嶅姟椤圭洰鍚嶇О" width="300" align="left" prop="itemname" />
+      <el-table-column label="鍗曚綅" width="80" align="center" prop="itemunit" />
+      <el-table-column label="鎻忚堪" width="300" align="left" prop="itemdescribe" />
+      <el-table-column label="璐圭敤褰掔被" width="220" align="center" prop="expensetypename" />
+      <el-table-column label="鍚敤鐘舵��" width="80" align="center" prop="usestate">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_0_1" :value="scope.row.usestate" />
         </template>
       </el-table-column>
-      <el-table-column label="澶囨敞" width="500" align="left" prop="remark" />
-      <el-table-column
-        label="鎿嶄綔"
-        align="left"
-        class-name="small-padding fixed-width"
-        width="220"
-        fixed="right"
-      >
+      <!--<el-table-column label="澶囨敞" width="500" align="left" prop="remark" />-->
+      <el-table-column label="鎿嶄綔" align="left" class-name="small-padding fixed-width" width="220" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            >淇敼</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            >鍒犻櫎</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀规敹鍏ヨ垂鐢ㄧ鐩璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="鎴愭湰绫诲瀷" prop="costtype">
-              <el-select
-                v-model="form.costtype"
-                placeholder="鎴愭湰绫诲瀷"
-                ref="costTypeSel"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_costtype"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
+          <el-col :span="24">
+            <el-form-item label="椤圭洰鍚嶇О" prop="itemname">
+              <el-input v-model="form.itemname" placeholder="璇疯緭鍏ユ湇鍔¢」鐩悕绉�" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="椤圭洰鎻忚堪" prop="itemdescribe">
+              <el-input v-model="form.itemdescribe" placeholder="璇疯緭鍏ラ」鐩弿杩�" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
-            <el-form-item label="璐圭敤绫诲瀷" prop="expensetype">
-              <el-select
-                v-model="form.expensetype"
-                placeholder="璐圭敤绫诲瀷"
-                ref="expenseTypeSel"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_expensetype"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+            <el-form-item label="鏈嶅姟绫诲瀷" prop="itemtype">
+              <el-select v-model="form.itemtype" placeholder="璇烽�夋嫨椤圭洰绫诲瀷">
+                <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select> </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鍗曚綅" prop="itemunit">
+              <el-select v-model="form.itemunit" placeholder="璇烽�夋嫨鍗曚綅">
+                <el-option v-for="dict in dict.type.sys_financeitemunit" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row
-          ><el-col :span="12"
-            ><el-form-item label="绉戠洰绫诲瀷" prop="subjecttype">
-              <el-select
-                v-model="form.subjecttype"
-                placeholder="璇烽�夋嫨椤圭洰绫诲瀷"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_finsubject"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+        <el-row>
+          <!--
+          <el-col :span="12">
+            <el-form-item label="鎴愭湰绫诲瀷" prop="costtype">
+              <el-select v-model="form.costtype" placeholder="鎴愭湰绫诲瀷" ref="costTypeSel">
+                <el-option v-for="dict in dict.type.sys_costtype" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          -->
+          <el-col :span="12"><el-form-item label="鎴愭湰鍒嗙被" prop="subjecttype">
+              <el-select v-model="form.subjecttype" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰鎴愭湰鍒嗙被">
+                <el-option v-for="dict in dict.type.sys_financesubject" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="璐圭敤褰掔被" prop="expensetype">
+              <el-select v-model="form.expensetype" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰璐圭敤褰掔被" ref="expenseTypeSel">
+                <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>         
+          <el-col :span="24">
             <el-form-item label="鍚敤">
               <el-radio-group v-model="form.usestate">
-                <el-radio
-                  v-for="dict in dict.type.sys_0_1"
-                  :key="dict.value"
-                  :label="dict.value"
-                  >{{ dict.label }}</el-radio
-                >
+                <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="dict.value">{{ dict.label
+                }}</el-radio>
               </el-radio-group>
-            </el-form-item></el-col
-          ></el-row
-        ><el-row
-          ><el-col :span="12">
-            <el-form-item label="椤圭洰绫诲瀷" prop="itemtype">
-              <el-select v-model="form.itemtype" placeholder="璇烽�夋嫨椤圭洰绫诲瀷">
-                <el-option
-                  v-for="dict in dict.type.sys_ConsolationType"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select> </el-form-item></el-col
-          ><el-col :span="12">
-            <el-form-item label="鍗曚綅" prop="itemunit">
-              <el-select v-model="form.itemunit" placeholder="璇烽�夋嫨鍗曚綅">
-                <el-option
-                  v-for="dict in dict.type.sys_finance_itemunit"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select> </el-form-item></el-col></el-row
-        ><el-row
-          ><el-col :span="24">
-            <el-form-item label="椤圭洰鍚嶇О" prop="itemname">
-              <el-input
-                v-model="form.itemname"
-                placeholder="璇疯緭鍏ラ」鐩悕绉�"
-              /> </el-form-item></el-col></el-row
-        ><el-row
-          ><el-col :span="24">
-            <el-form-item label="椤圭洰鎻忚堪" prop="itemdescribe">
-              <el-input
-                v-model="form.itemdescribe"
-                placeholder="璇疯緭鍏ラ」鐩弿杩�"
-              /> </el-form-item></el-col></el-row
-        ><el-row
-          ><el-col :span="24">
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <el-form-item label="澶囨敞" prop="remark">
-              <el-input
-                v-model="form.remark"
-                placeholder="璇疯緭鍏ュ娉�"
-              /> </el-form-item></el-col
-        ></el-row>
+              <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -346,6 +174,8 @@
     "sys_finance_itemunit",
     "sys_costtype",
     "sys_expensetype",
+    "sys_financeitemunit",
+    "sys_financesubject"
   ],
   data() {
     return {
@@ -381,9 +211,9 @@
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
-        costtype: [{ required: true, message: "璇烽�夋嫨鎴愭湰绫诲瀷", trigger: "blur" },],
-        expensetype: [{ required: true, message: "璇烽�夋嫨璐圭敤绫诲瀷", trigger: "blur" },],
-        subjecttype: [{ required: true, message: "璇烽�夋嫨绉戠洰绫诲瀷", trigger: "blur" },],
+        // costtype: [{ required: true, message: "璇烽�夋嫨鎴愭湰绫诲瀷", trigger: "blur" },],
+        expensetype: [{ required: true, message: "璇烽�夋嫨璐圭敤褰掔被", trigger: "blur" },],
+        subjecttype: [{ required: true, message: "璇烽�夋嫨鎴愭湰鍒嗙被", trigger: "blur" },],
         itemtype: [{ required: true, message: "璇烽�夋嫨椤圭洰绫诲瀷", trigger: "blur" },],
         itemname: [{ required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "blur" },],
       },
@@ -467,7 +297,6 @@
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          debugger
           this.form.costtypename = this.$refs.costTypeSel.selectedLabel;
           this.form.expensetypename = this.$refs.expenseTypeSel.selectedLabel;
           if (this.form.id != null) {
@@ -498,7 +327,7 @@
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
@@ -513,7 +342,7 @@
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
   },
 };

--
Gitblit v1.9.3