Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue

@@ -50,7 +50,12 @@
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center" />
             <el-table-column fixed label="操作" width="180" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+                <el-button type="primary" :disabled="scope.row.state == '2' || scope.row.state == '3'" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="支付状态" align="center" width="110">
+              <template slot-scope="scope">
+                <span>{{ scope.row.state == '1' ? '未支付' : scope.row.state == '2' ? '支付中' : scope.row.state == '3' ? '已支付' : '' }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="costTitleValue" label="款项名称" align="center" width="140" />

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -52,8 +52,6 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
@@ -73,7 +71,6 @@ import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java

@@ -47,8 +47,8 @@ public class ApPayBillCastToKingDeeBillFields {
             for (Map.Entry<String, String> entry : params.entrySet()) {
                 map_fEntityDetail_.put(entry.getKey(),entry.getValue());
             }
-            fPAYBILLENTRY_ =KingDeeUtils.replaceTemplateParams(fPAYBILLENTRY_, map_fEntityDetail_);
+           String fPAYBILLENTRY_NEW =KingDeeUtils.replaceTemplateParams(fPAYBILLENTRY_, map_fEntityDetail_);
-            list_fEntityDetail_.add(JSONObject.parseObject(fPAYBILLENTRY_,Feature.OrderedField));
+            list_fEntityDetail_.add(JSONObject.parseObject(fPAYBILLENTRY_NEW,Feature.OrderedField));
         }
 
         jsonFEntityModel_.put("FPAYBILLENTRY", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));

yxt-as-ui/src/views/storage/deliveryNotice/index.vue

@@ -399,7 +399,7 @@ export default {
       if (this.selectionList[0].billState === '已收货(部分终止)') {
         this.$message({
           type: 'warning',
-          message: '此记录已终止,不可在收货。',
+          message: '此记录已终止,不可再收货。',
           showClose: true
         })
         return

yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@@ -56,7 +56,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 收货人是否与上架人一致</div>
+              <div class="span-sty"><span class="must">*</span>收货人是否与上架人一致</div>
               <el-form-item prop="isUpShelf">
                 <el-radio-group v-model="formobj.isUpShelf" size="small" class="addinputInfo">
                   <el-radio :label="1">是</el-radio>
@@ -369,37 +369,29 @@ export default {
 }
 </script>
 <style scoped>
-/deep/ .el-form-item__error {
-  margin-left: 120px !important;
-}
-
 .must {
   color: #f00;
 }
 
 .span-sty {
-  width: 130px !important;
+  width: 150px !important;
 }
 
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 140px !important;
 }
 
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-  margin-left: 120px !important;
+  margin-left: 140px !important;
-  width: calc(100% - 115px);
+  width: calc(100% - 135px);
 }
 
-.first_row {
+/deep/ .el-form-item__error {
-  border-top: 1px solid #E0E3EB;
+  margin-left: 140px !important;
 }
 
-.titleOne {
+.first_row {
-  padding: 7px;
+  border-top: 1px solid #E0E3EB;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
 }
 
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {