财务对账修改001

src/views/finance/contrast/index.vue

@@ -384,7 +384,7 @@
           <el-button type="primary" size="small" @click="confirmReconciliation" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">确认对账</el-button>
           <el-button type="success" size="small" @click="backrRconciliation" v-if="queryParams.fBillstatus === '6'">撤销对账</el-button>
           <el-button type="info" size="small" @click="printing" :disabled="notChange">打印</el-button>
-          <el-button type="danger" size="small" :disabled="disappear" v-if="queryParams.fBillstatus === '6'">撤销审批</el-button>
+          <el-button type="danger" size="small" :disabled="disappear" v-if="queryParams.fBillstatus === '4'" @click="backApproval">撤销审批</el-button>
         </div>
 
         <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
@@ -438,11 +438,13 @@
       </el-table>
 
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="approve = false" @click="addOrUpdateHand">审批</el-button>
-        <el-button type="info" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
+        <el-button v-if="approve === true" @click="addOrUpdateHand">审批</el-button>
+        <el-button type="info" v-show="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
         <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
         <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
         <el-button @click="cancel">取 消</el-button>
+<!--        <el-button>取1消</el-button>-->
       </div>
 
       <!-- 添加或修改财务数据主对话框 -->
@@ -765,9 +767,10 @@ export default {
       disappear:false,
       addIndex:[],
       addOrUpdateVisible: false,
+      addOrUpdateVisib:false,
       contrastId:210,
       // 审批状态
-      approve:true,
+      approve:false,
       // 打印表
       printObject:[],
       //登陆人
@@ -893,10 +896,6 @@ export default {
         ]
       },
       feeListRules: {
-        // fCtrlcorpid: [
-        //   { required:true, message: '不能为空', trigger: 'blur'}
-        // ],
-
         fDc: [
           { required:true,message: '不能为空', trigger:'blur' }
         ],
@@ -909,15 +908,6 @@ export default {
         timeExamine: [
           { required: true, message: '审核日期不能为空', trigger: 'blur' }
         ]
-        // fBilltype: [
-        //   { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)不能为空", trigger: "change" }
-        // ],
-        // fBillstatus: [
-        //   { required: true, message: "状态不能为空", trigger: "blur" }
-        // ]
-        // fDeptid: [
-        //   { required: true, message: "制单部门不能为空", trigger: "change" }
-        // ],
       }
     };
   },
@@ -927,20 +917,28 @@ export default {
   },
   created() {
     this.getList()
-    // this.register()
+    this.register()
   },
   methods: {
+    backApproval(){
+
+    },
+    returnData(){
+      this.addOrUpdateVisib = false
+    },
     getDataList(){
     this.addOrUpdateVisible = false
   },
-    // 审批
+    // 审批按钮
     addOrUpdateHand(){
       this.addOrUpdateVisib = true
       this.addOrUpdateVisible = false
       let id = '448'
       let actId = '110'
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(id,actId)
+        console.log(this.queryParams.fId)
+        console.log(this.contrastId)
+        this.$refs.ApprovalComments.init(this.queryParams.fId,this.contrastId)
       })
     },
     // 查看审批流
@@ -1025,17 +1023,17 @@ export default {
       this.innerVisible = true
     },
     // 默认录入人
-    // register() {
-    //   queryUserVal().then((response)=>{
-    //     // this.Lander = response.user.userName
-    //     console.log(response)
-    //     this.Lander = response.user.userName
-    //     this.queryParams_s.createBy = response.user.userName
-    //   this.queryParams.createBy = response.user.userName
-    //   console.log(this.DzfeeList.createBy)
-    //   console.log(response.user.userName)
-    //   })
-    // },
+    register() {
+      queryUserVal().then((response)=>{
+        this.Lander = response.user.userName
+      //   console.log(response)
+      //   this.Lander = response.user.userName
+      //   this.queryParams_s.createBy = response.user.userName
+      // this.queryParams.createBy = response.user.userName
+      // console.log(this.DzfeeList.createBy)
+      // console.log(response.user.userName)
+      })
+    },
 
     getSummaries(param) {
         const { columns, data } = param;
@@ -1098,12 +1096,6 @@ export default {
     },
     /** 查询财务数据主列表 */
     getList() {
-      this.addIndex = this.$route.query.data
-      if(this.addIndex){
-        console.log(this.addIndex)
-        this.open = true
-      }
-      console.log(this.addIndex)
       this.loading = true;
        this.getDicts("approval_process").then(response => {
         // this.feeList = response.rows;
@@ -1291,6 +1283,11 @@ export default {
       // }
       // })
     },
+    // register(){
+    //   queryUserVal().then((response)=>{
+    //     this.Lander = response.user.userName
+    //   })
+    // },
     // 查看按钮
     check(row,res) {
       this.notChange = true
@@ -1302,12 +1299,15 @@ export default {
         this.fWbuOptions = response.data.feesList
         this.fMblnoOptions = response.data.corps
         this.open = true;
+        this.disappear = true
         this.title = "修改财务数据主";
+        console.log(this.Operator)
+        console.log(this.Lander)
         if (res == 1) {
           this.notChange = true
-          this.disappear = false
           console.log(this.notChange)
           if (this.Operator == this.Lander) {
+            this.disappear = false
             console.log(res)
             this.reset()
             this.pass = {
@@ -1357,7 +1357,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.notChange = true
+      this.notChange = false
       this.hide = false
       this.reset();
       this.pass={