更新修改缺陷

src/views/contractManagement/purchaseContractCost.vue

@@ -104,9 +104,8 @@
             <div style='display:inline-block;' v-if='scope.row.taskId'>
               <ws-button type="primary" @click="handleaudit(scope.row)">审核</ws-button>
             </div>
-             <div style='display:inline-block;' v-if='scope.row.status=="未付款"'>
-                <ws-button type="primary" @click="handlepayment(scope.row)"
-            v-hasPermission="`contractManagement.nonContract.nonContractInfo.status`">付款</ws-button>
+             <div style='display:inline-block;' v-if='scope.row.status=="待付款"'>
+                <ws-button type="primary" @click="handlepayment(scope.row)" v-hasPermission="`contractManagement.nonContract.nonContractInfo.status`">付款</ws-button>
              </div>
             <div style='display:inline-block;' v-if='scope.row.personName==staffName'>
             <ws-button type="primary" @click="handleedit(scope.row)"
@@ -192,14 +191,19 @@
       </div>
     </el-dialog>
     
-    <el-dialog width='50%' :visible.sync="dialogVisible1" title="审核记录">
-      <div v-for="item in recordList">
-        <div style='width:100%;justify-content: space-between;' class='flex'>
-          <div>{{item.operateUser}}</div>
-          <div>{{item.dealMsg}}</div>
-          <div>{{item.createDate}}</div>
+    <el-dialog :visible.sync="dialogVisible1" title="审核记录"  width="30%" top="20vh" class="title_css">
+      <div v-for="(item,index) in recordList" :key="index" class="audit">
+        <div class="audit_item">
+          <div class="audit_left">
+            <span class="audit_name">{{item.operateUser}}</span><span
+              v-if="item.approveResult">{{item.approveResult == 0 ? "驳回" : "通过"}}</span><span
+              v-else>{{item.dealMsg}}</span>
+          </div>
+          <span class="audit_date">{{item.operateDate}}</span>
+        </div>
+        <div class="audit_opinion" v-if="item.dealMsg != '付款' && item.approveResult">审核意见：{{item.verifyRemark}}</div>
+        <div class="audit_opinion" v-if="item.dealMsg == '请款' && item.approveResult == null">备注信息：{{item.verifyRemark}}
         </div>
-        <div style='width:100%;text-align:center;'>{{item.verifyRemark}}</div>
       </div>
     </el-dialog>
   </div>
@@ -801,4 +805,38 @@
     text-align: center !important;
     border-radius: 4px;
   }
+  /deep/.title_css .el-dialog__header {
+    text-align: center !important;
+    border-radius: 4px;
+  }
+   .audit {
+    margin-bottom: 20px;
+    border-bottom: 1px solid #AFB3BF;
+    height: 70px;
+
+    .audit_item {
+      width: 100%;
+      display: flex;
+      height: 30px;
+
+      .audit_name {
+        margin-right: 30px;
+        font-size: 16px;
+        font-weight: 600;
+      }
+
+      .audit_left {
+        width: 60%;
+      }
+
+      .audit_date {
+        width: 40%;
+        justify-content: flex-end;
+        display: flex;
+        color: #AFB3BF;
+      }
+    }
+
+    .audit_opinion {}
+  }
 </style>

src/views/contractManagement/salesContractCost.vue

@@ -189,14 +189,19 @@
         <el-button @click='confirm' type="primary">通过</el-button>
       </div>
     </el-dialog>
-    <el-dialog width='50%' :visible.sync="dialogVisible1" title="审核记录" >
-      <div v-for="item in recordList">
-        <div style='width:100%;justify-content: space-between;' class='flex'>
-          <div>{{item.operateUser}}</div>
-          <div>{{item.dealMsg}}</div>
-          <div>{{item.createDate}}</div>
+    <el-dialog width='30%' :visible.sync="dialogVisible1" title="审核记录" top="20vh">
+      <div v-for="(item,index) in recordList" :key="index" class="audit">
+        <div class="audit_item">
+          <div class="audit_left">
+            <span class="audit_name">{{item.operateUser}}</span><span
+              v-if="item.approveResult">{{item.approveResult == 0 ? "驳回" : "通过"}}</span><span
+              v-else>{{item.dealMsg}}</span>
+          </div>
+          <span class="audit_date">{{item.operateDate}}</span>
+        </div>
+        <div class="audit_opinion" v-if="item.dealMsg != '付款' && item.approveResult">审核意见：{{item.verifyRemark}}</div>
+        <div class="audit_opinion" v-if="item.dealMsg == '请款' && item.approveResult == null">备注信息：{{item.verifyRemark}}
         </div>
-        <div style='width:100%;text-align:center;'>{{item.verifyRemark}}</div>
       </div>
     </el-dialog>
   </div>
@@ -799,4 +804,39 @@
     text-align: center !important;
     border-radius: 4px;
   }
+  //审核记录弹框样式
+   /deep/.title_css .el-dialog__header {
+    text-align: center !important;
+    border-radius: 4px;
+  }
+  .audit {
+    margin-bottom: 20px;
+    border-bottom: 1px solid #AFB3BF;
+    height: 70px;
+
+    .audit_item {
+      width: 100%;
+      display: flex;
+      height: 30px;
+
+      .audit_name {
+        margin-right: 30px;
+        font-size: 16px;
+        font-weight: 600;
+      }
+
+      .audit_left {
+        width: 60%;
+      }
+
+      .audit_date {
+        width: 40%;
+        justify-content: flex-end;
+        display: flex;
+        color: #AFB3BF;
+      }
+    }
+
+    .audit_opinion {}
+  }
 </style>

src/views/profitable/contractOtherMoney.vue

@@ -59,9 +59,9 @@
           <el-table-column prop="payee" label="请款人/收款人" min-width="100"></el-table-column>
           <el-table-column prop="paymentDate" label="支付日期"></el-table-column>
           <el-table-column prop="createDate" label="录入日期" min-width="130"></el-table-column>
-          <el-table-column prop="status" label="状态" min-width="81">
+          <el-table-column prop="status" label="状态" min-width="120">
             <template slot-scope="scope">
-              <span style="margin-right:10px">{{scope.row.status}}</span><i class="el-icon-tickets icon_css"
+              <span style="margin-right:10px">{{scope.row.approveStatus ? scope.row.approveStatus : scope.row.status}}</span><i class="el-icon-s-claim"
                 v-show="scope.row.reexType == '支出'" @click="showAudit(scope.row)"></i>
             </template>
           </el-table-column>
@@ -72,7 +72,7 @@
               </el-button>
               <el-button @click="audit(2,scope.row)" v-if="scope.row.status != '已付款'"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.status`">付款</el-button>
-              <el-button @click="audit(5,scope.row)"
+              <el-button @click="audit(5,scope.row)" v-if="scope.row.status == '已驳回'"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.edit`">编辑</el-button>
               <el-button @click="delData(scope.row)" v-if="scope.row.status == '已驳回'"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.delete`">删除</el-button>
@@ -385,6 +385,7 @@
                 .toPromise()
                 .then((response) => {
                   if (response == 'ok') {
+                    this.formData.addressUrl = ""
                     this.formData = {}
                     this.dialogVisible = false
                     this.$notify({
@@ -464,6 +465,10 @@
           })
       },
       audit(num, row) {
+        debugger
+        this.formData.addressUrl = ""
+        this.formData = {}
+        this.$forceUpdate
         this.btnChange = num
         if (num == 1) {
           this.title = "审核"
@@ -656,12 +661,7 @@
     overflow-y: scroll;
     height: 546px;
 
-    .icon_css {
-      font-size: 15px;
-
-      color: #5473e8;
-
-    }
+ 
   }
 
   /deep/.title_css .el-dialog__header {