From 4f9b729dac1bc53bb1d0ddf43cf8c60ff5cdd8b7 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 07 九月 2023 16:28:35 +0800
Subject: [PATCH] 11

---
 src/views/project/travelexpensedeal/index.vue          |    2 
 src/api/project/itemexpense.js                         |   53 +++++++
 src/views/project/itemexpense/index.vue                |  309 ++++++++++++++++++++++++++++++++++++++++++++
 src/views/project/fund/applyDetail/index.vue           |   14 +
 src/views/project/fund/expertFeeApply/index.vue        |    2 
 src/views/project/fund/ethicalExpertFeeApply/index.vue |    2 
 src/views/project/fund/medicalCostApply/index.vue      |    2 
 src/views/project/fund/officeExpenseApply/index.vue    |    2 
 src/views/project/travelexpenseapply/index.vue         |    2 
 src/api/project/fund.js                                |    2 
 src/views/project/donatereview/index.vue               |    2 
 11 files changed, 378 insertions(+), 14 deletions(-)

diff --git a/src/api/project/fund.js b/src/api/project/fund.js
index 75f4e3e..aa853d5 100644
--- a/src/api/project/fund.js
+++ b/src/api/project/fund.js
@@ -68,7 +68,7 @@
 export function delFund(id) {
   return request({
     url: '/project/fund/' + id,
-    method: 'delete'
+    method: 'get'
   })
 }
 
diff --git a/src/api/project/itemexpense.js b/src/api/project/itemexpense.js
new file mode 100644
index 0000000..f1bd446
--- /dev/null
+++ b/src/api/project/itemexpense.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃
+export function listItemexpense(query) {
+  return request({
+    url: '/project/itemexpense/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏌ヨ鏀跺叆璐圭敤绉戠洰璇︾粏
+export function getItemexpense(id) {
+  return request({
+    url: '/project/itemexpense/' + id,
+    method: 'get'
+  })
+}
+
+// 鏂板鏀跺叆璐圭敤绉戠洰
+export function addItemexpense(data) {
+  return request({
+    url: '/project/itemexpense',
+    method: 'post',
+    data: data
+  })
+}
+
+// 淇敼鏀跺叆璐圭敤绉戠洰
+export function updateItemexpense(data) {
+  return request({
+    url: '/project/itemexpense',
+    method: 'put',
+    data: data
+  })
+}
+
+// 鍒犻櫎鏀跺叆璐圭敤绉戠洰
+export function delItemexpense(id) {
+  return request({
+    url: '/project/itemexpense/' + id,
+    method: 'delete'
+  })
+}
+
+// 瀵煎嚭鏀跺叆璐圭敤绉戠洰
+export function exportItemexpense(query) {
+  return request({
+    url: '/project/itemexpense/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/views/project/donatereview/index.vue b/src/views/project/donatereview/index.vue
index 0890e56..650fea0 100644
--- a/src/views/project/donatereview/index.vue
+++ b/src/views/project/donatereview/index.vue
@@ -183,7 +183,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleShow(scope.row)"
             v-hasPermi="['project:donatebaseinfo:edit']"
             >鏌ョ湅</el-button
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index e06d0bc..75c043e 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -423,7 +423,7 @@
                   plain
                   @click="ShowDetailDialog(scope, 'expert')"
                   >{{
-                    scope.row.unitname
+                    experthear == "expert"
                       ? scope.row.unitname
                       : scope.row.beneficiaryname
                   }}</el-button
@@ -896,8 +896,9 @@
           <el-col :span="24" v-if="experthear == 'expert'">
             <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
               <el-select
-                v-model="funddetailForm.unitno"
+                v-model="funddetailForm.unitname"
                 placeholder="鍗曚綅鍚嶇О"
+                @change="bbaaccss"
                 clearable
                 filterable
                 allow-create
@@ -907,7 +908,7 @@
                   v-for="(spec, index) in unitList"
                   :key="index"
                   :label="spec.organizationname"
-                  :value="spec.organizationid"
+                  :value="spec.organizationname"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -3246,9 +3247,10 @@
         }
       }
 
-      if (this.experthear == "unit") {
-        singleDetail.unitname = "";
-      }
+      // if (this.experthear == "unit") {
+      //   singleDetail.unitname = "";
+      // }
+      singleDetail.unitname = this.funddetailForm.unitname;
       console.log(this.funddetailForm);
       this.rbDetails[tempIndex] = singleDetail;
       this.showSelectionDialog = false;
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index 46bcfe8..e6f7b9e 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -100,7 +100,7 @@
                       scope.row.recordstatus == 1
                       " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                       v-hasPermi="['project:ethicalfund:edit']">淇敼</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
                     <el-button v-if="scope.row.recordstatus == -1 ||
                       scope.row.recordstatus == 1
                       " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index d0624fa..4776252 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -224,7 +224,7 @@
                     <el-button
                       size="mini"
                       type="text"
-                      icon="el-icon-edit"
+                      icon="el-icon-view"
                       @click="handleDetail(scope.row)"
                       >鏌ョ湅</el-button
                     >
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index fd3981d..ad18885 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -101,7 +101,7 @@
                       scope.row.recordstatus == 1
                       " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                       v-hasPermi="['project:medicalfund:edit']">淇敼</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
                     <el-button v-if="scope.row.recordstatus == -1 ||
                       scope.row.recordstatus == 1
                       " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index e548b45..3a5efc5 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -66,7 +66,7 @@
             scope.row.recordstatus == 1
             " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['project:medicalfund:edit']">淇敼</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
           <el-button v-if="scope.row.recordstatus == -1 ||
             scope.row.recordstatus == 1
             " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
diff --git a/src/views/project/itemexpense/index.vue b/src/views/project/itemexpense/index.vue
new file mode 100644
index 0000000..e7303c7
--- /dev/null
+++ b/src/views/project/itemexpense/index.vue
@@ -0,0 +1,309 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="鏈嶅姟椤圭洰ID" prop="itemid">
+        <el-input
+          v-model="queryParams.itemid"
+          placeholder="璇疯緭鍏ユ湇鍔¢」鐩甀D"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="璐圭敤閲戦" prop="expense">
+        <el-input
+          v-model="queryParams.expense"
+          placeholder="璇疯緭鍏ヨ垂鐢ㄩ噾棰�"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="璐圭敤璇存槑" prop="expensedescribe">
+        <el-input
+          v-model="queryParams.expensedescribe"
+          placeholder="璇疯緭鍏ヨ垂鐢ㄨ鏄�"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鍚敤鐘舵��" prop="usestate">
+        <el-input
+          v-model="queryParams.usestate"
+          placeholder="璇疯緭鍏ュ惎鐢ㄧ姸鎬�"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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-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:itemexpense: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:itemexpense: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:itemexpense: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:itemexpense:export']"
+        >瀵煎嚭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="itemexpenseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID锛屽敮涓�鍊�" align="center" prop="id" />
+      <el-table-column label="鏈嶅姟椤圭洰ID" align="center" prop="itemid" />
+      <el-table-column label="璐圭敤閲戦" align="center" prop="expense" />
+      <el-table-column label="璐圭敤璇存槑" align="center" prop="expensedescribe" />
+      <el-table-column label="鍚敤鐘舵��" align="center" prop="usestate" />
+      <el-table-column label="澶囨敞" align="center" prop="remark" />
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:itemexpense:edit']"
+          >淇敼</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['project:itemexpense:remove']"
+          >鍒犻櫎</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"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀规敹鍏ヨ垂鐢ㄧ鐩璇濇 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="鏈嶅姟椤圭洰ID" prop="itemid">
+          <el-input v-model="form.itemid" placeholder="璇疯緭鍏ユ湇鍔¢」鐩甀D" />
+        </el-form-item>
+        <el-form-item label="璐圭敤閲戦" prop="expense">
+          <el-input v-model="form.expense" placeholder="璇疯緭鍏ヨ垂鐢ㄩ噾棰�" />
+        </el-form-item>
+        <el-form-item label="璐圭敤璇存槑" prop="expensedescribe">
+          <el-input v-model="form.expensedescribe" placeholder="璇疯緭鍏ヨ垂鐢ㄨ鏄�" />
+        </el-form-item>
+        <el-form-item label="鍚敤鐘舵��" prop="usestate">
+          <el-input v-model="form.usestate" placeholder="璇疯緭鍏ュ惎鐢ㄧ姸鎬�" />
+        </el-form-item>
+        <el-form-item label="澶囨敞" prop="remark">
+          <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listItemexpense, getItemexpense, delItemexpense, addItemexpense, updateItemexpense, exportItemexpense } from "@/api/project/itemexpense";
+
+export default {
+  name: "Itemexpense",
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      // 瀵煎嚭閬僵灞�
+      exportLoading: false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 鏀跺叆璐圭敤绉戠洰琛ㄦ牸鏁版嵁
+      itemexpenseList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        itemid: null,
+        expense: null,
+        expensedescribe: null,
+        usestate: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃 */
+    getList() {
+      this.loading = true;
+      listItemexpense(this.queryParams).then(response => {
+        this.itemexpenseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        id: null,
+        itemid: null,
+        expense: null,
+        expensedescribe: null,
+        usestate: null,
+        remark: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞鏀跺叆璐圭敤绉戠洰";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getItemexpense(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "淇敼鏀跺叆璐圭敤绉戠洰";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateItemexpense(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addItemexpense(this.form).then(response => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏀跺叆璐圭敤绉戠洰缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delItemexpense(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('鏄惁纭瀵煎嚭鎵�鏈夋敹鍏ヨ垂鐢ㄧ鐩暟鎹」锛�').then(() => {
+        this.exportLoading = true;
+        return exportItemexpense(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index f378cc7..24412c3 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -213,7 +213,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleDetail(scope.row)"
             >鏌ョ湅</el-button
           >
diff --git a/src/views/project/travelexpensedeal/index.vue b/src/views/project/travelexpensedeal/index.vue
index d776639..034c3bc 100644
--- a/src/views/project/travelexpensedeal/index.vue
+++ b/src/views/project/travelexpensedeal/index.vue
@@ -191,7 +191,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['project:funddetail:edit']"
             >鏌ョ湅</el-button

--
Gitblit v1.9.3