From 2871dd51e0adc895781cf4ddb6979c93abe55b75 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 22 九月 2023 15:54:18 +0800
Subject: [PATCH] 11

---
 src/views/project/travelexpensecheck/index.vue                     |   66 ++++++++---
 src/views/project/fund/applyDetail/index.vue                       |   79 +++++++++----
 src/views/project/fundcheck/medicalCostCheck/index.vue             |   35 +++++
 src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue        |   53 ++++++++
 src/views/project/travelexpenseapply/travelexpensedetail/index.vue |   51 ++++++-
 src/views/project/fundcheck/expertFeeCheck/index.vue               |   33 +++++
 src/views/project/fundcheck/officeExpenseCheck/index.vue           |   35 +++++
 7 files changed, 294 insertions(+), 58 deletions(-)

diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index bc61882..943e623 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -128,7 +128,24 @@
               <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
             </el-form-item>
           </el-col>-->
-          <el-col :span="10">
+          <el-col :span="5">
+            <el-form-item label="棰勫鐘舵��" prop="infoid">
+              <el-select
+                v-model="form.checkstatus"
+                filterable
+                placeholder="璇烽�夋嫨棰勫鐘舵��"
+              >
+                <el-option
+                  v-for="item in baselisttages"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="鐢宠璇存槑" prop="remark">
               <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
             </el-form-item>
@@ -773,24 +790,21 @@
           v-if="
             operationType == 'add' ||
               operationType == 'update' ||
-              ismanager == true
+              ismanager == true ||
+              beforehandType == '1'
           "
           >鎻愪氦淇濆瓨</el-button
         >
         <el-button
-          type="primary"
+          type="success"
           @click="handleup"
-          v-if="
-            operationType == 'add' ||
-              operationType == 'update' ||
-              ismanager == true
-          "
+          v-if="operationType == 'add' || operationType == 'update'"
           >涓婃姤</el-button
         >
         <el-button
           type="primary"
           @click="checksubmit"
-          v-if="operationType == 'check'"
+          v-if="operationType == 'check' && beforehandType != '1'"
           >鎻愪氦瀹℃牳</el-button
         >
         <el-button @click="cancel">鍏� 闂�</el-button>
@@ -1104,28 +1118,27 @@
             "
           >
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="beneficiaryname"
             align="center"
             label="濮撳悕"
             v-if="form.applytype == '1' || form.applytype == '2'"
           >
-          </el-table-column>
+          </el-table-column> -->
 
-          <el-table-column
-            prop="unitno"
+          <!-- <el-table-column
+            prop="beneficiaryname"
             align="center"
             label="鍗曚綅鍚嶇О"
             width="250"
             v-if="form.applytype != '4'"
           >
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="beneficiaryname"
             align="center"
             label="鍗曚綅/涓汉"
             width="250"
-            v-if="form.applytype == '4'"
           >
           </el-table-column>
           <el-table-column
@@ -1463,6 +1476,20 @@
       ismanager: false,
       //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
       expertfrom: "1",
+      baselisttages: [
+        {
+          id: 1,
+          name: "寰呴瀹�"
+        },
+        {
+          id: 2,
+          name: "棰勫閫氳繃绛夊緟鏉愭枡"
+        },
+        {
+          id: 3,
+          name: "宸叉敹鍒版姤閿�鏉愭枡"
+        }
+      ],
 
       //鎹愮尞妗堜緥鍒楄〃
       donateList: [],
@@ -1597,7 +1624,7 @@
         money: "0",
         startTime: ""
       },
-
+      beforehandType: null,
       //鏈嶅姟璐圭敤鍙傛暟
       expenseQueryParams: {
         pageNum: 1,
@@ -1723,6 +1750,7 @@
       this.curId = this.$route.query.id;
       this.businessType = this.$route.query.businessType;
       this.operationType = this.$route.query.operationType;
+      this.beforehandType = this.$route.query.beforehandType;
 
       //鑾峰彇璐圭敤椤圭洰绫诲瀷
       this.getFeeTypes();
@@ -1960,10 +1988,10 @@
           JSON.stringify(this.rbDetails) ==
             sessionStorage.getItem("apifunddetail")) ||
         !sessionStorage.getItem("apifunddetail")
-      ){
-      }else{
-        this.$message.error('璇蜂繚瀛樺悗鍐嶈繘琛屼笂鎶�');
-        return
+      ) {
+      } else {
+        this.$message.error("璇蜂繚瀛樺悗鍐嶈繘琛屼笂鎶�");
+        return;
       }
       this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
         confirmButtonText: "纭畾",
@@ -1974,13 +2002,17 @@
           //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
           //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
           this.form.recordstatus = 0;
+          if (!this.form.id) {
+            this.form.id = this.$route.query.id
+          }
+          
           updateFund(this.form).then(response => {
             if (response.code == 200) {
               this.$message({
                 type: "success",
                 message: "鐢宠鎴愬姛"
               });
-              this.cancel()
+              this.cancel();
             } else {
               this.$message({
                 type: "error",
@@ -2254,8 +2286,6 @@
           //鍏抽棴绐楀彛
           this.loading = false;
           // this.getfundList();
-          // this.$store.dispatch("tagsView/delView", this.$route);
-          // this.$router.go(-1);
         }
       });
     }, 500),
@@ -2282,8 +2312,7 @@
       // this.reset();
       console.log(-this.Routinglevel);
       this.$store.dispatch("tagsView/delView", this.$route);
-        this.$router.go(-this.Routinglevel);
- 
+      this.$router.go(-this.Routinglevel);
     },
 
     //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index f361d1e..74630a4 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -147,6 +147,19 @@
             </template>
           </el-table-column>
           <el-table-column
+            label="棰勫鐘舵��"
+            width="140"
+            align="center"
+            prop="checkFlag"
+          >
+            <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="donorname"
@@ -170,6 +183,14 @@
                 v-if="scope.row.checkFlag == 0"
                 @click="handleDetail(scope.row)"
                 >璇︽儏</el-button
+              >
+              <el-button
+                v-if="scope.row.checkFlag == 1"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="beforehandCheck(scope.row)"
+                >棰勫鏍�</el-button
               >
               <el-button
                 v-if="scope.row.checkFlag == 1"
@@ -730,7 +751,8 @@
     "sys_ConsolationType",
     "sys_fund_type",
     "sys_finsubject",
-    "sys_financeitemtype"
+    "sys_financeitemtype",
+    "sys_stage_type"
   ],
   data() {
     return {
@@ -826,6 +848,21 @@
           label: "鍏ㄩ儴"
         }
       ],
+      // 瀹℃壒鍗曟祦绋�
+      checkFlagOptionsbar: [
+        {
+          value: 1,
+          label: "寰呴瀹�"
+        },
+        {
+          value: 2,
+          label: "棰勭畻閫氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡"
+        },
+        {
+          value: 3,
+          label: "鏀跺埌绾歌川鎶ラ攢鏉愭枡"
+        }
+      ],
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
@@ -916,7 +953,7 @@
   mounted() {
     if (grtItem("ethicalExpertFeeCheck")) {
       this.queryParams = grtItem("ethicalExpertFeeCheck");
-    };
+    }
     this.selectReporters();
     this.getlistOrganization();
     //this.getlistUser();
@@ -1029,7 +1066,6 @@
     isopenvalue(index) {
       this.isopen = index;
     },
-
     tojust(e) {
       let username = "111";
       getFund(e).then(res => {
@@ -1235,6 +1271,17 @@
         });
       }
     },
+    beforehandCheck(row) {
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          beforehandType: "1",
+          businessType: "2",
+          operationType: "check",
+        }
+      });
+    },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleCheck(row) {
       this.$router.push({
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 264798d..90d6299 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -88,6 +88,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="donorname" width="120px" />
           <el-table-column label="澶囨敞" align="center" prop="remark" />
           <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />
@@ -96,6 +109,14 @@
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
                 @click="handleDetail(scope.row)">璇︽儏</el-button>
+                <el-button
+                v-if="scope.row.checkFlag == 1"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="beforehandCheck(scope.row)"
+                >棰勫鏍�</el-button
+              >
               <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
                 @click="handleCheck(scope.row)">瀹℃牳</el-button>
               <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
@@ -444,6 +465,7 @@
     "sys_fund_type",
     "sys_finsubject",
     "sys_financeitemtype",
+    "sys_stage_type"
   ],
   data() {
     return {
@@ -942,6 +964,17 @@
         });
       }
     },
+    beforehandCheck(row){
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "2",
+          beforehandType:'1',
+          operationType: "check",
+        }
+      });
+    },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleCheck(row) {      
       this.$router.push({
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 8792ddd..d59a34a 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -187,6 +187,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="remark" />
           <el-table-column
             label="鎿嶄綔"
@@ -196,6 +209,14 @@
             width="260px"
           >
             <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.checkFlag == 1"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="beforehandCheck(scope.row)"
+                >棰勫鏍�</el-button
+              >
               <el-button
                 v-if="scope.row.checkFlag == 1"
                 size="mini"
@@ -911,7 +932,8 @@
     "sys_fund_type",
     "sys_finsubject",
     "sys_financeitemtype",
-    "sys_consolationfundlevel"
+    "sys_consolationfundlevel",
+    "sys_stage_type"
   ],
   data() {
     return {
@@ -1360,6 +1382,17 @@
         });
       }
     },
+    beforehandCheck(row){
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "3",
+          beforehandType:'1',
+          operationType: "check",
+        }
+      });
+    },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleCheck(row) {
       this.$router.push({
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index 22410ae..e1eca67 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -167,6 +167,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="remark" />
           <el-table-column
             label="鎿嶄綔"
@@ -183,6 +196,14 @@
                 v-if="scope.row.checkFlag == 0"
                 @click="handleDetail(scope.row)"
                 >璇︽儏</el-button
+              >
+              <el-button
+                v-if="scope.row.checkFlag == 1"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="beforehandCheck(scope.row)"
+                >棰勫鏍�</el-button
               >
               <el-button
                 v-if="scope.row.checkFlag == 1"
@@ -892,7 +913,8 @@
     "sys_fund_type",
     "sys_finsubject",
     "sys_financeitemtype",
-    "sys_consolationfundlevel"
+    "sys_consolationfundlevel",
+    "sys_stage_type"
   ],
   data() {
     return {
@@ -1342,6 +1364,17 @@
         });
       }
     },
+    beforehandCheck(row){
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "2",
+          beforehandType:'1',
+          operationType: "check",
+        }
+      });
+    },
     /** 瀹℃牳鎸夐挳鎿嶄綔 */
     handleCheck(row) {
       this.$router.push({
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index f9c0d0e..f9798b0 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -84,7 +84,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="7">
             <el-form-item label="澶у啓閲戦" prop="bigstrmoney">
               <el-input
                 :disabled="true"
@@ -92,7 +92,7 @@
                 placeholder="鎶ラ攢澶у啓閲戦"
               />
             </el-form-item> </el-col
-          ><el-col :span="5">
+          ><el-col :span="4">
             <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
               <el-select
                 v-model="form.recordstatus"
@@ -107,6 +107,23 @@
                   :label="dict.label"
                   :value="dict.value"
                 />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="棰勫鐘舵��" prop="infoid">
+              <el-select
+                v-model="form.checkstatus"
+                filterable
+                placeholder="璇烽�夋嫨棰勫鐘舵��"
+              >
+                <el-option
+                  v-for="item in baselisttages"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -920,13 +937,13 @@
         <el-button
           type="primary"
           @click="submitForm"
-          v-if="operationType == 'edit'"
+          v-if="operationType == 'edit'||beforehandType=='1'"
           >淇� 瀛�</el-button
         >
         <el-button
           type="primary"
           @click="checksubmit"
-          v-if="operationType == 'check'"
+          v-if="operationType == 'check'&& beforehandType!='1'"
           >鎻� 浜�</el-button
         >
         <!--<el-button @click="cancel">閫� 鍑�</el-button>-->
@@ -946,8 +963,7 @@
           <el-table-column prop="orderno" label="搴忓彿"> </el-table-column>
           <el-table-column prop="personname" label="璐圭敤浜哄憳">
           </el-table-column>
-          <el-table-column prop="starttime" label="寮�濮嬫棩鏈�">
-          </el-table-column>
+          <el-table-column prop="starttime" label="寮�濮嬫棩鏈�"> </el-table-column>
           <el-table-column prop="endtime" label="缁撴潫鏃ユ湡"> </el-table-column>
           <el-table-column prop="departure" label="鍑哄彂鍦�"> </el-table-column>
           <el-table-column prop="destination" label="鍒拌揪鍦�"> </el-table-column>
@@ -1254,6 +1270,20 @@
       rbDetails: [],
       rbPayees: [],
       arrr2: [],
+      baselisttages: [
+        {
+          id: 1,
+          name: "寰呴瀹�"
+        },
+        {
+          id: 2,
+          name: "棰勫閫氳繃绛夊緟鏉愭枡"
+        },
+        {
+          id: 3,
+          name: "宸叉敹鍒版姤閿�鏉愭枡"
+        },
+      ],
       baselist: [],
       donatorList: [],
       standardlevel: 0,
@@ -1271,7 +1301,7 @@
       persontype: null,
       //鍒拌揪鍦�
       arriveAddr: null,
-
+      beforehandType:null,
       headers: {
         Authorization: "Bearer " + getToken()
       },
@@ -1333,6 +1363,7 @@
     let curId = this.$route.query.id;
     let pos = this.$route.query.pos;
     this.defaultperson = this.$route.query.routerparam;
+    this.beforehandType = this.$route.query.beforehandType;
     if (pos == 1) {
       this.handleAdd(curId);
     } else if (pos == 2) {
@@ -1349,7 +1380,7 @@
     });
   },
   destroyed() {
-    window.removeEventListener('beforeunload', e => this.beforeunloadFn(e))
+    window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
   }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
 
   methods: {
@@ -2212,7 +2243,7 @@
           const rbDetails = [...this.rbDetails];
           const rbPayees = [...this.rbPayees];
           if (this.form.id != null) {
-            console.log(this.form);
+            console.log(this.form); 
             updateReimbursement(this.form);
             //   .then(res => {
             //淇濆瓨鏄庣粏
@@ -2544,7 +2575,7 @@
       })
         .then(() => {
           console.log(row);
-          let arrow=[];
+          let arrow = [];
           arrow.push(row.id);
           if (row.id !== null) {
             delReimbursementpayee(arrow).then(res => {
diff --git a/src/views/project/travelexpensecheck/index.vue b/src/views/project/travelexpensecheck/index.vue
index 72b4be2..1760192 100644
--- a/src/views/project/travelexpensecheck/index.vue
+++ b/src/views/project/travelexpensecheck/index.vue
@@ -128,19 +128,7 @@
           <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="瀹℃壒鐘舵��"
-        width="120"
-        align="center"
-        prop="checkFlag"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_recordstatus"
-            :value="scope.row.recordstatus"
-          />
-        </template>
-      </el-table-column>
+
       <el-table-column
         label="缁忓姙浜�"
         width="120"
@@ -166,14 +154,41 @@
         prop="amountrequested"
       >
       </el-table-column>
-      <el-table-column label="鍑哄樊浜嬬敱" align="center" prop="reason">
-      </el-table-column>
+
       <el-table-column
         label="鎹愮尞鑰�"
         width="120"
         align="center"
         prop="donorname"
       >
+      </el-table-column>
+      <el-table-column
+        label="瀹℃壒鐘舵��"
+        width="140"
+        align="center"
+        prop="checkFlag"
+      >
+        <template slot-scope="scope">
+          <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="reason">
       </el-table-column>
       <!-- 
       <el-table-column label="鍑哄樊浜�" width="180" align="center" prop="travelers">
@@ -200,10 +215,18 @@
       >
         <template slot-scope="scope">
           <el-button
+                v-if="scope.row.checkFlag == 1"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="beforehandCheck(scope.row)"
+                >棰勫鏍�</el-button
+              >
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.checkFlag == 1 || scope.row.checkFlag == 0"
+            v-if="scope.row.checkFlag == 1"
             @click="handleUpdate(scope.row)"
             >瀹℃壒</el-button
           >
@@ -1094,7 +1117,7 @@
           />
           <el-table-column
             label="瀹℃牳鏃ユ湡"
-            align="center"
+            align="center" 
             width="160"
             prop="createTime"
           />
@@ -1212,7 +1235,8 @@
     "sys_0_1",
     "sys_fund_type",
     "sys_financeitemtype",
-    "sys_travelexpensebelong"
+    "sys_travelexpensebelong",
+"sys_stage_type",
   ],
   data() {
     return {
@@ -1532,6 +1556,12 @@
       this.open = true;
       this.title = "娣诲姞鎶ラ攢鐢宠";
     },
+    beforehandCheck(row){
+      this.$router.push({
+        path: "/finance/travelexpenseapply/travelexpensedetail/",
+        query: { id: row.id, pos: 4,beforehandType:'1' }
+      });
+    },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
       this.$router.push({

--
Gitblit v1.9.3