Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@@ -51,7 +51,7 @@
               <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
               <el-table-column label="操作" align="center" width="180px">
                 <template slot-scope="scope">
-                  <el-button type="primary" :disabled="scope.row.auditState !== 3 && scope.row.subscriptionState !== 2" size="small" @click="handUpdate(scope.row)">办理</el-button>
+                  <el-button type="primary" :disabled="!scope.row.showHandle" size="small" @click="handUpdate(scope.row)">认款</el-button>
                   <el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button>
                 </template>
               </el-table-column>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -148,6 +148,11 @@
                     {{ scope.row.customerPhone }}
                   </template>
                 </el-table-column>
+                <el-table-column label="应收金额" align="center" width="120">
+                  <template slot-scope="scope">
+                    {{ scope.row.reveivableMoney }}
+                  </template>
+                </el-table-column>
                 <el-table-column label="应收项目名称" align="center" width="120">
                   <template slot-scope="scope">
                     {{ scope.row.receivablesName }}
@@ -522,6 +527,7 @@ export default {
           subscriptionMoney: '',
           subscriptionDate: '',
           collSid: '',
+          receivablesSid: row.sid,
           sid: row.sid
         })
         this.listQuery.sids.push(row.sid)

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@@ -71,11 +71,11 @@
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="3" class="tleftb">
             <span>车辆型号</span>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.vehMark }}</span>
@@ -515,6 +515,7 @@ export default {
       req.fetchBySid(sid).then(resp => {
         if (resp.success) {
           const vdata = resp.data
+          this.formobj.sid = sid
           this.formobj.insideCode = vdata.insideCode
           this.formobj.contract = vdata.contract
           this.formobj.remarks = vdata.remarks