合同

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -289,7 +289,7 @@ export const allRouters = [//组织架构
     {
         path: '/',
         component: Home,
-        name: '项目管理',
+        name: '合同管理',
         iconCls: 'iconfont firerock-iconxiangmu',
         leaf: true,
         children: [

fhKeeper/formulahousekeeper/timesheet/src/views/contract/index.vue

@@ -78,7 +78,7 @@
           <el-button v-if="permissions.contractView || permissions.contractManagement" size="mini" @click="lookover(scope.row)">查看</el-button>
           <el-button v-if="permissions.contractManagement" size="mini" @click="editContract(scope.row)" type="primary">编辑</el-button>
           <el-button v-if="permissions.contractAudit && (scope.row.status == 1 || scope.row.status == 3)" size="mini" @click="process(scope.row,0)" type="success">通过</el-button>
-          <el-button v-if="permissions.contractAudit && (scope.row.status == 1 || scope.row.status == 3)" size="mini" @click="process(scope.row,2)" type="danger">驳回</el-button>
+          <el-button v-if="permissions.contractAudit && (scope.row.status == 1 || scope.row.status == 3)" size="mini" @click="processR(scope.row,2)" type="danger">驳回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -264,6 +264,16 @@
         </el-upload>
       </div>
     </el-dialog>
+    
+    <el-dialog :title="$t('defaultText.pleaseEnterTheReason')"  v-if="denyReasonDialog" :visible.sync="denyReasonDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
+            <div>
+                <el-input type="textarea" v-model="denyReason" rows="2" placeholder="请输入驳回原因" />
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button  @click="denyReasonDialog = false" >{{$t('btn.cancel')}}</el-button>
+                <el-button type="primary" @click="process(null,2)" >{{$t('btn.submit')}}</el-button>
+            </div>
+        </el-dialog>
   </section>
 </template>
 
@@ -293,6 +303,10 @@ export default {
       typeItemDialog: false,
       typeItemForm: {typeName: ''},
 
+      denyReasonDialog: false,
+      denyReason: '',
+      denyrow: null,
+
       dialogTitle: '新增',
       addDialog: false,
       lookoverDialog: false,
@@ -566,13 +580,28 @@ export default {
         });          
       });
     },
+    processR(row,status){
+      this.denyReasonDialog = true
+      this.denyrowId = row.id
+    },
     process(row,status){
-      this.http.post('/contract/processContract',{
-        id: row.id,
-        status: status
-      },res => {
+      let parameter
+      if(status == 2){
+        parameter = {
+          id: this.denyrowId,
+          status: status,
+          msg: this.denyReason
+        }
+      }else{
+        parameter = {
+          id: row.id,
+          status: status
+        }
+      }
+      this.http.post('/contract/processContract',parameter,
+      res => {
         if(res.code == 'ok'){
-          row.status = status
+          this.getContractList()
           this.$message({
             message: status == 0 ? '已通过' : '已驳回',
             type: 'success'

fhKeeper/formulahousekeeper/timesheet_h5/src/views/my/children/center.vue

@@ -18,7 +18,7 @@
                 <van-cell title="公司" :title-style="'flex: 0.5;'" :value="userInfo.companyName"></van-cell>
                 <!-- <van-cell title="修改密码" isLink to="/my/set"></van-cell> -->
             </div>
-            <van-cell :title="'绑定'+(isCorpWX?'企业':'')+'微信'" v-if="isCorpWX || isWX" @click="bindWeiXin" style="margin-top:10px;" :title-style="'flex: 2.5;'" label="绑定微信后可接收工时填报提醒">
+            <van-cell :title="'绑定'+(isCorpWX?'企业':'')+'微信'" v-if="isWX" @click="bindWeiXin" style="margin-top:10px;" :title-style="'flex: 2.5;'" label="绑定微信后可接收工时填报提醒">
                 <template>
                     <span v-if="(isCorpWX && userInfo.corpwxUserid == null) || (isWX && userInfo.wxOpenid == null)" style="color:#ff0000;">未绑定</span>
                     <span v-if="(isCorpWX && userInfo.corpwxUserid != null) || (isWX && userInfo.wxOpenid != null)" style="color:#7CCD7C;">已绑定</span>