发布

src/components/Finance/PayReceived.vue

@@ -52,6 +52,7 @@
             </div>
             <div class="received-form">
                 <el-table
+                height="560"
                 :border="true"
                 ref="multipleTable"
                 :data="UnassignedData"
@@ -152,6 +153,10 @@
                     </el-table-column>
                 </el-table>
             </div>
+            <div>
+                <div style="margin: 20px 0 6px 0">特殊情况说明</div>
+                <el-input style="width:100%" type="textarea" rows="2" v-model="unSettleReason"></el-input>
+            </div>
         </div>
     </div>
 </template>
@@ -189,6 +194,7 @@ export default {
                 // visitPNumber:'',
                 // visitStartDate:'',
             },
+            unSettleReason:'',
         }
     },
     methods:{
@@ -267,9 +273,8 @@ export default {
                     diId: that.value
                 }
             }).then(function (res) {
-                console.log(res)
-                that.UnassignedData=res.data.data
-                that.groupInfo=res.data.data.groupInfo
+                that.UnassignedData=res.data.data.groupReceivablesList;
+                that.unSettleReason = res.data.data.unSettleReason;
                 that.PostShareGroupInfo();
             })
         },
@@ -353,6 +358,12 @@ export default {
                 remark:""//备注
             }
             this.UnassignedData.push(newinif)
+            this.$nextTick(() => {
+                const bodyWrapper = this.$el.querySelector('.el-table__body-wrapper');
+                if (bodyWrapper) {
+                    bodyWrapper.scrollTop = bodyWrapper.scrollHeight;
+                }
+            });
             // var url = "/api/Financial/PostAmountReceivedAddOrEdit"
             // var that = this
             // this.$axios({
@@ -426,6 +437,8 @@ export default {
                         portType: 1,
                         diId: that.value,
                         userId:that.userid,
+                        userId:that.userid,
+                        unSettleReason: that.unSettleReason,
                         _ProceedsReceivedInfos:arrnew
                     }
                 }).then(function (res) {
@@ -469,8 +482,6 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
-    height: 100%;
-    min-height: 830px;
 }
 .received-head-li label{
     color: #606266;

src/components/OP/EntryDetails.vue

@@ -1941,6 +1941,8 @@ export default {
             currencyinfo = this.othercurrencys.find(function (i) {
                 return i.currencyId === obj.currency
             });
+            console.log(this.othercurrencys);
+            
             rate = currencyinfo.rate;
             this.otherExpense = 0;
             for (let l = 0; l < this.otherData.length; l++) {