调整费用报销的驳回原因

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -38,7 +38,7 @@
                         <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px" v-if="item.jobNumber">{{ item.jobNumber }}</span>
                     </el-option>
                 </el-select>
-                <!-- <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="users" :subjectId="executorItem.executorId" :distinction="'1'" @selectCal="selectCal" :index="index" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !(groupResponsibleId == user.id)"></selectCat> -->
+                <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="users" :subjectId="executorItem.executorId" :distinction="'1'" @selectCal="selectCal" :index="index" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !(groupResponsibleId == user.id)"></selectCat>
                 
                 <span style="margin-left:30px;margin-right:10px;">{{ $t('plantime') }}</span>
                 <el-input-number size="small" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !(groupResponsibleId == user.id)" v-model="gstimday[index]" style="width:16%;" :min="1" :max="100"  :placeholder="$t('danweitian')" @change="chggstim(0,index)"></el-input-number ><span style="margin-left:5px;">{{ $t('time.day') }}</span>
@@ -562,6 +562,7 @@
 </template>
 
 <script>
+import selectCat from "@/components/select.vue"
 // 富文本样式
 import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
@@ -577,6 +578,7 @@ export default {
   },
   components: {
     quillEditor, // 富文本
+    selectCat
   },
   data() {
     return {

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -13,7 +13,7 @@
               text-color="#666666"
               active-text-color="#20A0FF"
               style="width:100%">
-              <el-submenu index="1">
+              <el-submenu index="1"> 
                 <template slot="title">
                   <i class="iconfont firerock-icontianbao"></i>
                   <span>{{ $t('fillinthestaffexpenses') }}</span>
@@ -279,11 +279,11 @@
                   <span v-if="scope.row.status == 0 || scope.row.status == 3" >{{statusTxt[scope.row.status]}}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="denyReason" :label="$t('dismissreason')" width="180">
+              <!-- <el-table-column prop="denyReason" :label="$t('dismissreason')" width="180">
                 <template slot-scope="scope">
                   <span style="font-size:12px;">{{scope.row.denyReason}}</span>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column fixed="right" :label="$t('operation')" :width="isAuditList?220:160">
                   <template slot-scope="scope" >
                       <div v-if="!isAuditList">
@@ -855,7 +855,8 @@ export default {
     denyReason(item){
       this.denyForm.id = item.id
       this.denyForm.reason = ''
-      this.denyReasonDialog = true
+      // this.denyReasonDialog = true
+      this.deny()
     },
     deny() {
       //审核驳回

fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/index.vue

@@ -169,7 +169,7 @@
                         <div><span>发票张数：</span><span>{{item.ticketNum}}</span></div>
                         <div><span>费用类型：</span><span>{{typeList[item.type]}}</span></div>
                         <!-- <div><span>状态：</span><span>{{item.status}}</span></div> -->
-                        <div><span>驳回原因：</span><span>{{item.denyReason}}</span></div>
+                        <!-- <div><span>驳回原因：</span><span>{{item.denyReason}}</span></div> -->
                         <div><span>备注：</span><span>{{item.remark}}</span></div>
                     </div>
                     <div class="operation">
@@ -208,7 +208,7 @@
                         <div><span>发票张数：</span><span>{{item.ticketNum}}</span></div>
                         <div><span>费用类型：</span><span>{{typeList[item.type]}}</span></div>
                         <!-- <div><span>状态：</span><span>{{item.status}}</span></div> -->
-                        <div><span>驳回原因：</span><span>{{item.denyReason}}</span></div>
+                        <!-- <div><span>驳回原因：</span><span>{{item.denyReason}}</span></div> -->
                         <div><span>备注：</span><span>{{item.remark}}</span></div>
                     </div>
                     <div class="lookup">
@@ -216,13 +216,13 @@
                     </div>
                 </van-collapse-item>
             </van-collapse>
-            <van-popup v-model="denyReasonDialog" position="bottom" closeable >
+            <!-- <van-popup v-model="denyReasonDialog" position="bottom" closeable >
                 <van-cell>请输入原因</van-cell>
                 <van-field class="form_input"
                     v-model="denyParm.denyReason" name="reason" type="textarea" placeholder="请输入您决定驳回的原因"
                     rows="3" autosize  />
                 <van-button style="width:100%;" type="info" :loading="denyLoading" @click="deny()">提交</van-button>
-            </van-popup>
+            </van-popup> -->
         </div>
     </div>
 </div>
@@ -605,6 +605,8 @@ export default {
         denyToReason(pid){
             this.denyParm.id = pid
             this.denyReasonDialog = true
+            this.denyParm.denyReason = ''
+            this.deny()
         },
         deny(){
             this.denyLoading = true