From 59c2e6665e5d2dcfe3516af2373f1c8a7c9e2bc2 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期六, 07 十月 2023 14:06:52 +0800
Subject: [PATCH] 1
---
src/views/project/fund/applyDetail/index.vue | 17 +++++
src/views/project/fund/expertFeeApply/index.vue | 16 +++++
src/views/project/fund/ethicalExpertFeeApply/index.vue | 15 +++++
src/views/project/fund/medicalCostApply/index.vue | 16 +++++
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 56 ------------------
src/views/project/fund/officeExpenseApply/index.vue | 15 +++++
src/views/project/fund/performanceApply/index.vue | 17 +++++
src/views/project/travelexpenseapply/index.vue | 27 +++++----
8 files changed, 108 insertions(+), 71 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index b9cf296..f1bebe6 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -494,6 +494,21 @@
</template>
</el-table-column>
<el-table-column
+ prop="itemdescribe"
+ align="center"
+ width="330"
+ label="椤圭洰璇存槑"
+ >
+ <template slot-scope="scope">
+ <el-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.itemdescribe"
+ placeholder="椤圭洰璇存槑"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
prop="remark"
align="center"
width="330"
@@ -2995,6 +3010,7 @@
updateBy: null,
updateTime: null,
uploadflag: null,
+ itemdescribe: null,
uploadtime: null,
itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }],
servicesscope: null,
@@ -3019,6 +3035,7 @@
beneficiaryname: null,
beneficiaryno: null,
unitname: null,
+ itemdescribe:null,
unitno: null,
uintuserno: null,
title: null,
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index e3502bf..c37fc5f 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -86,6 +86,19 @@
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
+ <el-table-column
+ label="棰勫鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<!--
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
@@ -515,6 +528,8 @@
"sys_finsubject",
"sys_financeitemtype",
"sys_expensetype",
+ "sys_stage_type"
+
],
data() {
//杩欓噷瀛樻斁鏁版嵁
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index f762887..4eeba97 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -186,6 +186,19 @@
/>
</template>
</el-table-column>
+ <el-table-column
+ label="棰勫鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<!--
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
@@ -1144,7 +1157,8 @@
//"sys_financeitemtype",
//"sys_expensetype",
"sys_recordstatus",
- "sys_professionaltitle"
+ "sys_professionaltitle",
+ "sys_stage_type"
],
data() {
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index f8c3558..a245a59 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -87,6 +87,19 @@
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
+ <el-table-column
+ label="棰勫鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<!--
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="150px" />
@@ -197,7 +210,8 @@
"sys_fund_type",
"sys_finsubject",
"sys_financeitemtype",
- "sys_expensetype"
+ "sys_expensetype",
+ "sys_stage_type"
],
data() {
//杩欓噷瀛樻斁鏁版嵁
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index da46cc8..d21e542 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -52,6 +52,19 @@
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
+ <el-table-column
+ label="棰勫鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<!--
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="150px" />
@@ -526,6 +539,8 @@
"sys_finsubject",
"sys_financeitemtype",
"sys_expensetype",
+ "sys_stage_type"
+
],
data() {
//杩欓噷瀛樻斁鏁版嵁
diff --git a/src/views/project/fund/performanceApply/index.vue b/src/views/project/fund/performanceApply/index.vue
index 91629d0..7d1c1d2 100644
--- a/src/views/project/fund/performanceApply/index.vue
+++ b/src/views/project/fund/performanceApply/index.vue
@@ -142,6 +142,19 @@
</template>
</el-table-column>
<el-table-column
+ label="棰勫鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
label="缁╂晥绫诲瀷"
width="150"
align="center"
@@ -252,7 +265,9 @@
"sys_finsubject",
"sys_financeitemtype",
"sys_expensetype",
- "sys_performance_type"
+ "sys_performance_type",
+ "sys_stage_type"
+
],
data() {
//杩欓噷瀛樻斁鏁版嵁
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index faf9fc8..8e9f492 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -70,17 +70,6 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="5">
- <el-form-item label="鎹愮尞鑰�" prop="donorname" style="float: left">
- <el-input
- v-model="queryParams.donorname"
- placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�"
- clearable
- size="small"
- @keyup.enter.native="flowconclusion"
- />
- </el-form-item>
- </el-col>
<el-col :span="4">
<el-form-item>
<el-button
@@ -154,6 +143,19 @@
<dict-tag
:options="dict.type.sys_recordstatus"
:value="scope.row.recordstatus"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="棰勫鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
/>
</template>
</el-table-column>
@@ -1261,7 +1263,8 @@
"sys_recordstatus",
"sys_travelexpensebelong",
"sys_traffictype",
- "sys_area_name"
+ "sys_area_name",
+ "sys_stage_type"
],
data() {
return {
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index f9798b0..214cc38 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -2165,62 +2165,6 @@
submitForm: debounce(function(data) {
this.$refs["form"].validate(valid => {
if (valid) {
- // idisabled=true;
- /**
- let indexErrTime = this.rbDetails.findIndex((item) => {
- if (item.endtime && item.starttime) {
- let d = this.$moment(item.endtime).diff(this.$moment(item.starttime), "d");
- if (d < 0) {
- return true;
- } else {
- return false;
- }
- } else {
- false;
- }
- });
-
- if (indexErrTime > -1) {
- this.$message({
- message: "绗�" + (indexErrTime + 1) + "琛屽埌杈炬棩鏈熸棭浜庡嚭鍙戞棩鏈�",
- type: "warning",
- });
- return;
- }
-
- let emptyStartTimeindex = this.rbDetails.findIndex(
- (item) => item.starttime == null || item.starttime == undefined || item.starttime == ""
- );
-
- if (emptyStartTimeindex > -1) {
- this.$message({
- message: "绗�" + (emptyStartTimeindex + 1) + "琛屽嚭鍙戞棩鏈熶负绌�",
- type: "warning",
- });
- return;
- }
-
- let emptyEndTimeindex = this.rbDetails.findIndex(
- (item) => item.endtime == null || item.endtime == undefined || item.endtime == ""
- );
-
- if (emptyEndTimeindex > -1) {
- this.$message({
- message: "绗�" + (emptyEndTimeindex + 1) + "琛屽埌杈炬棩鏈熶负绌�",
- type: "warning",
- });
- return;
- }
-
- //璐圭敤褰掑睘
- let belongArr = this.dict.type.sys_travelexpensebelong;
- let costtypeindex = belongArr.findIndex(
- (item) => this.form.costtype == item.value
- );
- if (costtypeindex > -1) {
- this.form.costtypename = belongArr[costtypeindex].label;
- }
- */
//绁ㄦ嵁鏂囦欢澶勭悊
const addnumber = this.rbPayees.reduce(
--
Gitblit v1.9.3