diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
index fd7e109489..51477d513c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
@@ -308,7 +308,7 @@
             WHERE
             busState = '401'
            <!-- AND  (finState = '1' OR carryVehicleState = '1' )) AND bbv.vehicleState != '0002'-->
-            AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1')))  AND bbv.vehicleState != '0002'
+            AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and finState = '1' and manageState = '1')))  AND bbv.vehicleState != '0002'
         </where>
         order by bo.contractNo desc,bv.id desc) a
 
@@ -344,7 +344,7 @@
             WHERE
             busState = '401'
            <!-- and (finState = '1' OR carryVehicleState = '1' ))-->
-            AND ((saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1')))
+            AND ((saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and finState = '1' and manageState = '1')))
             AND bbv.vehicleState != '0002'
         </where>
         GROUP BY
@@ -447,7 +447,7 @@
             anrui_base.base_vehicle_state
             WHERE
             busState = '401'
-            AND (saleTypeKey = '2' and invoiceApplyState = '1'))
+            AND (saleTypeKey = '2' and finState = '1' and manageState = '1'))
             AND bbv.vehicleState != '0002'
         </where>
         GROUP BY
@@ -543,7 +543,7 @@
         WHERE
         busState = '401'
         <!--and (finState = '1' OR carryVehicleState = 1 ))-->
-       AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = 1 )) or (saleTypeKey = '2' and invoiceApplyState = '1')))
+       AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = 1 )) or (saleTypeKey = '2' and finState = '1' and manageState = '1')))
     </select>
 
     <select id="vinLists3" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
@@ -591,7 +591,7 @@
         anrui_base.base_vehicle_state
         WHERE
         busState = '401'
-        AND (saleTypeKey = '2' and invoiceApplyState = '1'))
+        AND (saleTypeKey = '2' and finState = '1' and manageState = '1'))
     </select>
 
     <select id="vinLists2" resultType="com.yxt.anrui.buscenter.api.busdelivered.VinListVo2">
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index ed4765e526..bdcc85402e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -416,27 +416,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
-            if ("2".equals(dto.getPaymentMethodKey()) && "1".equals(dto.getIsInvoicing())){
-                List<BusDeliveredApplyDetailsDto> detailsList = dto.getDetailsList();
-                for (BusDeliveredApplyDetailsDto busDeliveredApplyDetailsDto : detailsList) {
-                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractNo(), busDeliveredApplyDetailsDto.getVinSid());
-                    BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData();
-                    if (!"1".equals(baseVehicleState.getFinState())){
-                        return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "款项未交清，保存失败");
-                    }
-                    if ("3".equals(baseVehicleState.getFinSourceKey())){//非担保
-                        String investigateValue = loanHomevisitInvestigateFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData();
-                        if (!"通过".equals(investigateValue)){
-                            return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访考察未通过，保存失败");
-                        }
-                    }else if ("4".equals(baseVehicleState.getFinSourceKey())){//担保
-                        String state = loanHomevisitFileexamineFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData();
-                        if (!"2".equals(state)){
-                            return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访资料审核未通过，保存失败");
-                        }
-                    }
-                }
-            }
             //新增
             BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
index 09048fc4f8..3923bc384b 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
@@ -471,6 +471,28 @@ public class InvoicedService {
             }
 
         } else {
+            if ("2".equals(busDeliveredApply.getPaymentMethodKey())){
+                String userSid = query.getUserSid();
+                String orgPath = query.getOrgPath();
+                List<String> vins = query.getVins();
+                if(vins.size() == 0){
+                    return rb.setMsg("请选择车辆");
+                }
+                ResultBean<BillApplicationIInfoVoss> billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins);
+                if(billApplicationIInfoVoResultBean.getData() != null){
+                    BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData();
+                    BeanUtil.copyProperties(billApplicationIInfoVoss,billApplicationIInfoVo);
+                }
+                SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
+                billApplicationIInfoVo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName());
+                billApplicationIInfoVo.setShowBtn(true);
+                billApplicationIInfoVo.setInvoiceStateKey("001");
+                billApplicationIInfoVo.setInvoiceState("正常开票");
+                billApplicationIInfoVo.setDate(DateUtil.formatDate(new Date()));
+                billApplicationIInfoVo.setShowXsState(true);
+                return rb.success().setData(billApplicationIInfoVo);
+            }
             billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
             billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());
             billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId());
diff --git a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
index 027e61c60e..bd3a558dd3 100644
--- a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
@@ -19,11 +19,20 @@
         </div>
         <el-row class="first_row">
 
-          <el-col :span="12">
+          <el-col :span="8">
+            <div class="span-sty">申请人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
+          </el-col>
+
+          <!--  <el-col :span="12">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          </el-col> -->
+          <el-col :span="8">
             <div class="span-sty">申请日期</div>
             <el-form-item>
               <el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
@@ -32,42 +41,32 @@
             </el-form-item>
           </el-col>
 
-        </el-row>
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">申请人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">申请部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
-          </el-col>
-
         </el-row>
 
         <el-row>
 
-          <el-col :span="12">
-            <div class="span-sty">处理方式</div>
+          <el-col :span="8">
+            <div class="span-sty">处理原因</div>
             <el-form-item>
-              <el-select v-model="formobj.handleModeValue" placeholder="请选择" class="addinputw addinputInfo">
-                <el-option v-for="(item,i) in handleModeList" :key="i" :label="item.name" :value="item.sid">
+              <el-select v-model="formobj.handleReasonValue" placeholder="请选择" class="addinputw addinputInfo">
+                <el-option v-for="(item,i) in handleReasonList" :key="i" :label="item.name" :value="item.sid">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">处理原因</div>
+
+          <el-col :span="16">
+            <div class="span-sty">处理方式</div>
             <el-form-item>
-              <el-select v-model="formobj.handleReasonValue" placeholder="请选择" class="addinputw addinputInfo">
-                <el-option v-for="(item,i) in handleReasonList" :key="i" :label="item.name" :value="item.sid">
+              <el-select v-model="formobj.handleModeValue" placeholder="请选择" class="addinputw addinputInfo">
+                <el-option v-for="(item,i) in handleModeList" :key="i" :label="item.name" :value="item.sid">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
 
         </el-row>
+
         <el-row>
 
           <el-col :span="24">
@@ -86,8 +85,8 @@
           <el-col :span="24">
             <div class="span-sty">附件</div>
             <el-form-item>
-              <upload-img ref="uploadImg" class="addinputw" v-model="formobj.filePaths" :limit="50"
-                bucket="map" :upload-data="{ type: '0001' }" />
+              <upload-img ref="uploadImg" class="addinputw" v-model="formobj.filePaths" :limit="50" bucket="map"
+                :upload-data="{ type: '0001' }" />
             </el-form-item>
           </el-col>
 
@@ -230,16 +229,16 @@
         formobj: {
           "sid": "",
           "remarks": "",
-          "createBySid":  window.sessionStorage.getItem('userSid'),
+          "createBySid": window.sessionStorage.getItem('userSid'),
           "createByName": window.sessionStorage.getItem('name'),
-          "createDeptSid":  window.sessionStorage.getItem('departmentSid'),
-          "createDeptName":  window.sessionStorage.getItem('departmentName'),
+          "createDeptSid": window.sessionStorage.getItem('departmentSid'),
+          "createDeptName": window.sessionStorage.getItem('departmentName'),
           "createTime": "",
           "billNo": "",
           "filePaths": [],
           "useOrgSid": window.sessionStorage.getItem('orgSid'),
           "useOrgName": window.sessionStorage.getItem('Orgname'),
-          "orgSidPath":  window.sessionStorage.getItem('orgSidPath'),
+          "orgSidPath": window.sessionStorage.getItem('orgSidPath'),
           "procDefId": "",
           "nodeId": "",
           "procInstId": "",
diff --git a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue
index 5e90d59727..098338601a 100644
--- a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue
@@ -17,41 +17,41 @@
         </div>
         <el-row class="first_row">
 
-          <el-col :span="12">
-            <div class="span-sty">单据编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">申请日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-          </el-col>
-
-        </el-row>
-        <el-row>
-
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">申请部门</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
           </el-col>
 
+
+          <!--     <el-col :span="12">
+            <div class="span-sty">单据编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+
         </el-row>
 
         <el-row>
 
-          <el-col :span="12">
-            <div class="span-sty">处理方式</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.handleModeValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">处理原因</div>
             <el-form-item><span class="addinputInfo">{{ formobj.handleReasonValue }}</span></el-form-item>
           </el-col>
+          <el-col :span="16">
+            <div class="span-sty">处理方式</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.handleModeValue }}</span></el-form-item>
+          </el-col>
+
 
         </el-row>
+
         <el-row>
 
           <el-col :span="24">
diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
index 0e45bae3de..87170cac07 100644
--- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
@@ -20,44 +20,46 @@
         </div>
         <el-row class="first_row">
 
-          <el-col :span="12">
+        <!--  <el-col :span="12">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          </el-col> -->
+          <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item>
+              <el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
+                value-format="yyyy-MM-dd" placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
         </el-row>
-        <el-row>
+<!--        <el-row>
 
           <el-col :span="12">
             <div class="span-sty">分公司</div>
             <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">申请部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
-          </el-col>
+
 
         </el-row>
         <el-row>
 
-          <el-col :span="12">
-            <div class="span-sty">申请日期</div>
-            <el-form-item>
-              <el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
-                value-format="yyyy-MM-dd" placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="12">
             <div class="span-sty">流程状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
           </el-col>
 
-        </el-row>
+        </el-row> -->
         <el-row>
 
           <el-col :span="24">
diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
index 897bab248b..701f6cd00f 100644
--- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
@@ -14,64 +14,65 @@
 
     <div class="listconadd">
 
-     <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-       <div class="title">
-         <div>基础信息</div>
-       </div>
-       <el-row class="first_row">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
+          <div>基础信息</div>
+        </div>
+        <el-row class="first_row">
 
-         <el-col :span="12">
+          <!--  <el-col :span="12">
            <div class="span-sty">单据编号</div>
            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-         </el-col>
-         <el-col :span="12">
-           <div class="span-sty">申请人</div>
-           <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-         </el-col>
-
-       </el-row>
-       <el-row>
-
-         <el-col :span="12">
-           <div class="span-sty">分公司</div>
-           <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
-         </el-col>
-         <el-col :span="12">
-           <div class="span-sty">申请部门</div>
-           <el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
-         </el-col>
-
-       </el-row>
-       <el-row>
-
-         <el-col :span="12">
-           <div class="span-sty">申请日期</div>
+         </el-col> -->
+          <el-col :span="8">
+            <div class="span-sty">申请人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-         </el-col>
-         <el-col :span="12">
-           <div class="span-sty">流程状态</div>
-           <el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
-         </el-col>
+          </el-col>
+        </el-row>
+       <!-- <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">分公司</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
+          </el-col>
+
+
+        </el-row>
+        <el-row>
 
-       </el-row>
-       <el-row>
+          <el-col :span="12">
+            <div class="span-sty">流程状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
+          </el-col>
 
-         <el-col :span="24">
-           <div class="span-sty">备注</div>
-             <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-         </el-col>
+        </el-row> -->
+        <el-row>
 
-       </el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+
+        </el-row>
 
         <el-row>
-         <el-col :span="24">
-           <div class="span-sty">附件</div>
-           <el-form-item class="trightb_item">
-             <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
-               v-for="(item,index) in formobj.filePaths" :src="item.url" :preview-src-list="[item.url]">
-             </el-image>
-           </el-form-item>
-         </el-col>
+          <el-col :span="24">
+            <div class="span-sty">附件</div>
+            <el-form-item class="trightb_item">
+              <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
+                v-for="(item,index) in formobj.filePaths" :src="item.url" :preview-src-list="[item.url]">
+              </el-image>
+            </el-form-item>
+          </el-col>
 
         </el-row>
 
@@ -82,14 +83,14 @@
         <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
           :row-style="{height: '40px'}">
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column label="商品名称" prop="goodsSkuName" align="center"  />
+          <el-table-column label="商品名称" prop="goodsSkuName" align="center" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
           <el-table-column label="厂家" prop="manufacturerName" align="center" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
           <el-table-column label="单位" prop="unit" align="center" />
-          <el-table-column label="需返厂数量" prop="needReturnCount" align="center"  />
-          <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"  />
-          <el-table-column label="差异说明" prop="remarks" align="center"  />
+          <el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
+          <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
+          <el-table-column label="差异说明" prop="remarks" align="center" />
         </el-table>
 
       </el-form>
@@ -101,7 +102,7 @@
 </template>
 
 <script>
-import req from '@/api/storage/oldPartsFactory.js'
+  import req from '@/api/storage/oldPartsFactory.js'
 
   export default {
     components: {},
diff --git a/yxt-as-ui/src/views/storage/oldPartsInvertory/oldPartsInvertoryInfo.vue b/yxt-as-ui/src/views/storage/oldPartsInvertory/oldPartsInvertoryInfo.vue
index 1e7845fc42..b43826ed9a 100644
--- a/yxt-as-ui/src/views/storage/oldPartsInvertory/oldPartsInvertoryInfo.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsInvertory/oldPartsInvertoryInfo.vue
@@ -14,44 +14,39 @@
 
     <div class="listconadd">
 
-     <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-       <div class="title">
-         <div>基础信息</div>
-       </div>
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
+          <div>基础信息</div>
+        </div>
         <el-row class="first_row">
 
-          <el-col :span="12">
+          <el-col :span="8">
+            <div class="span-sty">车架号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
             <div class="span-sty">商品名称</div>
             <el-form-item><span class="addinputInfo">{{ formobj.goodsSpuName }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">商品编码</div>
-             <el-form-item><span class="addinputInfo">{{ formobj.goodsSkuCode }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.goodsSkuCode }}</span></el-form-item>
           </el-col>
 
         </el-row>
         <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">车架号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">厂家</div>
-             <el-form-item><span class="addinputInfo">{{ formobj.manufacturerName }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.manufacturerName }}</span></el-form-item>
           </el-col>
 
-
-        </el-row>
-        <el-row>
-
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">仓库</div>
             <el-form-item><span class="addinputInfo">{{ formobj.warehouseName }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">库位</div>
-             <el-form-item><span class="addinputInfo">{{ formobj.warehouseRackCode }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.warehouseRackCode }}</span></el-form-item>
           </el-col>
 
         </el-row>
@@ -60,7 +55,7 @@
           style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
           <div>出入库记录列表</div>
         </div>
-        <el-table v-loading="listLoading" :data="formobj.list" border >
+        <el-table v-loading="listLoading" :data="formobj.list" border>
           <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
           <el-table-column label="来源单号" prop="billNo" align="center" />
           <el-table-column label="单据类型" prop="billType" align="center" />
@@ -125,29 +120,29 @@
     }
   }
 </script>
-<style  scoped>
- .span-sty {
-   width: 130px !important;
- }
-
- .addinputInfo {
-   margin-left: 120px !important;
- }
-
- .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-   margin-left: 120px !important;
-   width: calc(100% - 115px);
- }
-
- .first_row{
-   border-top: 1px solid #E0E3EB;
- }
-
- .titleOne {
-   padding: 7px;
-   display: flex;
-   flex-direction: row;
-   justify-content: space-between;
-   align-items: center;
- }
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
 </style>
diff --git a/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue b/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue
index 55c47607fa..dfdd86a73d 100644
--- a/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue
+++ b/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue
@@ -13,52 +13,46 @@
       <!-- end 详情按钮 -->
     </div>
     <div class="listconadd">
-     <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-       <div class="title">
-         <div>基础信息</div>
-       </div>
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
+          <div>基础信息</div>
+        </div>
         <el-row class="first_row">
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">制单人姓名</div>
-             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
-
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">外部单号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据日期</div>
-             <el-form-item><el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo" value-format="yyyy-MM-dd"
-                placeholder="选择日期">
+            <el-form-item><el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo"
+                value-format="yyyy-MM-dd" placeholder="选择日期">
               </el-date-picker>
-              </el-form-item>
+            </el-form-item>
           </el-col>
-
         </el-row>
 
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
             <div class="span-sty">业务类型</div>
-            <el-form-item><el-select v-model="formobj.busTypeValue" filterable clearable placeholder="请选择"class="addinputInfo"
-                @change="busTypeSelect">
+            <el-form-item><el-select v-model="formobj.busTypeValue" filterable clearable placeholder="请选择"
+                class="addinputInfo" @change="busTypeSelect">
                 <el-option v-for="item in busTypeList" :key="item.sid" :label="item.name" :value="item.sid">
                 </el-option>
               </el-select>
-              </el-form-item>
+            </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
@@ -69,7 +63,8 @@
 
           <el-col :span="24">
             <div class="span-sty">备注</div>
-            <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputInfo"type="textarea" :rows="4" clearable />
+            <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputInfo" type="textarea"
+                :rows="4" clearable />
             </el-form-item>
           </el-col>
 
@@ -137,14 +132,14 @@
         submitdisabled: false,
         formobj: {
           "sourceBillNo": "",
-          "createByName":  window.sessionStorage.getItem('name'),
+          "createByName": window.sessionStorage.getItem('name'),
           "busTypeKey": "",
           "busTypeValue": "",
           "billState": '新建',
-          "createOrgSid":  window.sessionStorage.getItem('orgSid'),
+          "createOrgSid": window.sessionStorage.getItem('orgSid'),
           "useOrgSid": window.sessionStorage.getItem('orgSid'),
           "sid": "",
-          "createBySid":  window.sessionStorage.getItem('userSid'),
+          "createBySid": window.sessionStorage.getItem('userSid'),
           "createTime": "",
           "remarks": "",
           "detailsList": [
diff --git a/yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue b/yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue
index 57c0e938b8..c33ec3bbfc 100644
--- a/yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue
+++ b/yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue
@@ -20,24 +20,15 @@
         </div>
         <el-row class="first_row">
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">制单人姓名</div>
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
-
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">外部单号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据日期</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span>
             </el-form-item>
@@ -48,10 +39,14 @@
         <el-row>
 
           <el-col :span="12">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
             <div class="span-sty">业务类型</div>
             <el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span>
             </el-form-item>
@@ -129,29 +124,29 @@
     }
   }
 </script>
-<style  scoped>
- .span-sty {
-   width: 130px !important;
- }
-
- .addinputInfo {
-   margin-left: 120px !important;
- }
-
- .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-   margin-left: 120px !important;
-   width: calc(100% - 115px);
- }
-
- .first_row {
-   border-top: 1px solid #E0E3EB;
- }
-
- .titleOne {
-   padding: 7px;
-   display: flex;
-   flex-direction: row;
-   justify-content: space-between;
-   align-items: center;
- }
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
 </style>
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
index 9dff7df705..a8f5120eee 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
@@ -19,35 +19,29 @@
         </div>
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">制单人姓名</div>
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
             <el-form-item> <el-input v-model="formobj.createByName" placeholder="" class="addinputw addinputInfo"
                 clearable /></el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">外部单号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据日期</div>
             <el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo"
                 value-format="yyyy-MM-dd" placeholder="选择日期">
               </el-date-picker></el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
             <div class="span-sty">业务类型</div>
             <el-form-item><el-select v-model="formobj.busTypeValue" filterable clearable placeholder="请选择"
                 class="addinputInfo" @change="busTypeSelect">
@@ -55,7 +49,7 @@
                 </el-option>
               </el-select></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">供应商</div>
             <el-form-item> <el-select v-model="formobj.supplierName" filterable clearable placeholder="请选择"
                 class="addinputInfo" @change="supplierNameSelect">
@@ -68,13 +62,13 @@
 
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">到货日期</div>
             <el-form-item><el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputInfo"
                 value-format="yyyy-MM-dd" placeholder="选择日期">
               </el-date-picker></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="16">
             <div class="span-sty">单据状态</div>
             <el-form-item> <span class="addinputInfo">{{formobj.billState}}</span></el-form-item>
           </el-col>
@@ -136,7 +130,7 @@
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
           <el-table-column label="单位" prop="unit" align="center" width="120" />
-         <!-- <el-table-column label="仓库" align="center" width="180">
+          <!-- <el-table-column label="仓库" align="center" width="180">
             <template slot-scope="scope">
               <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
                 @change="selectWarehouseName(scope.row,$event)">
@@ -275,7 +269,7 @@
           "sourceBillSid": "",
           "sourceBillNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName":window.sessionStorage.getItem('name'),
+          "createByName": window.sessionStorage.getItem('name'),
           "createTime": "",
           "busTypeKey": "",
           "busTypeValue": "",
@@ -284,7 +278,7 @@
           "deliveryDate": "",
           "billState": "新建",
           "remarks": "",
-          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "useOrgSid": window.sessionStorage.getItem('departmentSid'),
           "createOrgSid": window.sessionStorage.getItem('orgSid'),
           "list": [],
           "pcList": []
@@ -782,7 +776,7 @@
           sid: row.sid
         }
 
-        req.init( row.sid)
+        req.init(row.sid)
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data
@@ -809,9 +803,9 @@
 
       },
       getsupplierLust() {
-       var params = {
-         orgSid: window.sessionStorage.getItem('orgSid'),
-       }
+        var params = {
+          orgSid: window.sessionStorage.getItem('orgSid'),
+        }
         req.choiceSupplier(window.sessionStorage.getItem('orgSid')).then((res) => {
           if (res.success) {
             this.supplierList = res.data
@@ -822,6 +816,10 @@
         })
       },
       getWarehouseList() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+
         req2.getWarehouses().then((res) => {
           if (res.success) {
             this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
index dce2d43053..30bc65978f 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
@@ -20,36 +20,32 @@
         </div>
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">制单人姓名</div>
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
-
+          <el-col :span="8">
+            <div class="span-sty">单据日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
 
-          <el-col :span="12">
-            <div class="span-sty">外部单号</div>
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">单据日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-          </el-col>
-
-        </el-row>
-        <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">业务类型</div>
             <el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">供应商</div>
             <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
           </el-col>
@@ -58,11 +54,11 @@
 
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">到货日期</div>
             <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="16">
             <div class="span-sty">单据状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
index 2e247e7b45..655cca38ba 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
@@ -21,40 +21,39 @@
         </div>
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">制单人姓名</div>
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
             <el-form-item><el-input v-model="formobj.createByName" placeholder="" class="addinputw addinputInfo"
                 clearable /></el-form-item>
           </el-col>
-
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">外部单号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据日期</div>
             <el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo"
                 value-format="yyyy-MM-dd" placeholder="选择日期">
               </el-date-picker></el-form-item>
           </el-col>
-
         </el-row>
 
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="16">
             <div class="span-sty">单据状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
                 type="textarea" :rows="1" clearable /></el-form-item>
diff --git a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
index 4a7145bd12..f7325bb636 100644
--- a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
+++ b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
@@ -21,24 +21,16 @@
         </div>
         <el-row class="first_row">
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">制单人姓名</div>
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
             <el-form-item><el-input v-model="formobj.createByName" placeholder="" class="addinputw addinputInfo"
                 clearable /></el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">外部单号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据日期</div>
             <el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputw addinputInfo"
                 value-format="yyyy-MM-dd" placeholder="选择日期">
@@ -47,19 +39,31 @@
           </el-col>
 
         </el-row>
+
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="16">
             <div class="span-sty">单据状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+
+        </el-row>
+
+        <el-row>
+
+
+          <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
                 clearable /></el-form-item>
           </el-col>
 
         </el-row>
+
         <div class="title">
           <div>商品列表</div>
         </div>
diff --git a/yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue b/yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue
index 0d1f4ea765..4b1c3f088f 100644
--- a/yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue
+++ b/yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue
@@ -20,36 +20,36 @@
         </div>
         <el-row class="first_row">
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">单据编号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">制单人姓名</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
-
+          <el-col :span="8">
+            <div class="span-sty">单据日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
         </el-row>
+
         <el-row>
 
-          <el-col :span="12">
+          <el-col :span="8">
             <div class="span-sty">来源单号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="span-sty">单据日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          <el-col :span="16">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
 
         </el-row>
 
         <el-row>
 
-          <el-col :span="12">
-            <div class="span-sty">单据状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApply.java
index 7e6ca027c8..435f654d49 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApply.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApply.java
@@ -56,18 +56,12 @@ public class AsArrearsoutApply extends BaseEntity {
 
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("发起部门sid")
-    private String createDeptSid; // 发起部门sid
-	@ApiModelProperty("发起部门名称")
-    private String createDeptName; // 发起部门名称
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("工单sid")
     private String pairBillSid; // 工单sid
 	@ApiModelProperty("工单编号")
     private String pairBillNo; // 工单编号
-	@ApiModelProperty("工单类型")
-    private String billType; // 工单类型
 	@ApiModelProperty("科目sid")
     private String subjectSid; // 科目sid
 	@ApiModelProperty("科目名称")
@@ -92,8 +86,6 @@ public class AsArrearsoutApply extends BaseEntity {
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
 	@ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
 	@ApiModelProperty("环节定义的sid")
@@ -108,4 +100,17 @@ public class AsArrearsoutApply extends BaseEntity {
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
 
+    @ApiModelProperty("发起部门sid")
+    private String deptSid;
+    @ApiModelProperty("发起部门名称")
+    private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("结算日期")
+    private Date balanceDate;
+    @ApiModelProperty("工单类型key")
+    private String billTypeKey;
+    @ApiModelProperty("工单类型value")
+    private String billTypeValue;
+    @ApiModelProperty("客户联系电话")
+    private String customerPhone;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java
index e27a8f657c..0307d68e16 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java
@@ -32,6 +32,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -55,20 +57,18 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("发起部门sid")
-    private String createDeptSid; // 发起部门sid
-	@ApiModelProperty("发起部门名称")
-    private String createDeptName; // 发起部门名称
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("工单sid")
     private String pairBillSid; // 工单sid
 	@ApiModelProperty("工单编号")
     private String pairBillNo; // 工单编号
-	@ApiModelProperty("工单类型")
-    private String billType; // 工单类型
 	@ApiModelProperty("科目sid")
     private String subjectSid; // 科目sid
 	@ApiModelProperty("科目名称")
@@ -87,14 +87,12 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
     private BigDecimal pairReceivedMoney; // 工单已交金额
 	@ApiModelProperty("工单欠款金额")
     private BigDecimal pairArrearsMoney; // 工单欠款金额
-	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
-    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+	@ApiModelProperty("附件路径")
+    private List<AsArrearsoutApplyFile> filePaths; // 附件路径(多个附件之间英文逗号隔开)
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
 	@ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
 	@ApiModelProperty("环节定义的sid")
@@ -109,4 +107,17 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
 
+    @ApiModelProperty("发起部门sid")
+    private String deptSid;
+    @ApiModelProperty("发起部门名称")
+    private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("结算日期")
+    private Date balanceDate;
+    @ApiModelProperty("工单类型key")
+    private String billTypeKey;
+    @ApiModelProperty("工单类型value")
+    private String billTypeValue;
+    @ApiModelProperty("客户联系电话")
+    private String customerPhone;
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java
index f9915755b3..9bb78d66b2 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java
@@ -32,6 +32,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -55,20 +57,18 @@ public class AsArrearsoutApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("发起部门sid")
-    private String createDeptSid; // 发起部门sid
-	@ApiModelProperty("发起部门名称")
-    private String createDeptName; // 发起部门名称
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("工单sid")
     private String pairBillSid; // 工单sid
 	@ApiModelProperty("工单编号")
     private String pairBillNo; // 工单编号
-	@ApiModelProperty("工单类型")
-    private String billType; // 工单类型
 	@ApiModelProperty("科目sid")
     private String subjectSid; // 科目sid
 	@ApiModelProperty("科目名称")
@@ -87,14 +87,12 @@ public class AsArrearsoutApplyDto implements Dto {
     private BigDecimal pairReceivedMoney; // 工单已交金额
 	@ApiModelProperty("工单欠款金额")
     private BigDecimal pairArrearsMoney; // 工单欠款金额
-	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
-    private String filePath; // 附件路径(多个附件之间英文逗号隔开)
+    @ApiModelProperty("附件路径")
+    private List<AsArrearsoutApplyFile> filePaths; // 附件路径(多个附件之间英文逗号隔开)
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
 	@ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
 	@ApiModelProperty("环节定义的sid")
@@ -109,4 +107,17 @@ public class AsArrearsoutApplyDto implements Dto {
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
 
+    @ApiModelProperty("发起部门sid")
+    private String deptSid;
+    @ApiModelProperty("发起部门名称")
+    private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("结算日期")
+    private Date balanceDate;
+    @ApiModelProperty("工单类型key")
+    private String billTypeKey;
+    @ApiModelProperty("工单类型value")
+    private String billTypeValue;
+    @ApiModelProperty("客户联系电话")
+    private String customerPhone;
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyFile.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyFile.java
new file mode 100644
index 0000000000..48c775f852
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyFile.java
@@ -0,0 +1,35 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asarrearsoutapply;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AsArrearsoutApplyFile implements Vo {
+
+    private String url;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java
index 4f5e59e456..b48716b43f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java
@@ -65,4 +65,6 @@ public interface AsArrearsoutApplyMapper extends BaseMapper<AsArrearsoutApply> {
 	List<AsArrearsoutApplyVo> selectListVo();
 
     int updateFlowFiled(Map<String, Object> map);
+
+    String selectNum(String billNo);
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml
index a5e2eeb423..42302ea165 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml
@@ -28,4 +28,12 @@
 		</if>
 		WHERE sid=#{sid}
     </update>
+
+	<select id="selectNum" resultType="java.lang.String">
+		select RIGHT (billNo, 4)
+		from as_arrearsout_apply
+		where billNo LIKE concat(#{billNo}, '%')
+		order by billNo desc
+				limit 1
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java
index c6cd24e506..b2f354ac58 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java
@@ -26,10 +26,12 @@
 package com.yxt.anrui.as.biz.asarrearsoutapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.api.asarrearsoutapply.flowable.*;
+import com.yxt.anrui.as.feign.base.billno.Rule;
 import com.yxt.anrui.as.feign.flowable.flow.*;
 import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
 import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign;
@@ -40,6 +42,8 @@ import com.yxt.anrui.as.feign.message.MessageFeign;
 import com.yxt.anrui.as.feign.message.MessageFlowVo;
 import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
 import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
 import org.apache.commons.lang3.StringUtils;
@@ -76,6 +80,8 @@ import java.util.stream.Collectors;
 @Service
 public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApplyMapper, AsArrearsoutApply> {
 
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
@@ -158,7 +164,24 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
 
     public String saveOrUpdateDto(AsArrearsoutApplyDto dto) {
         String dtoSid = dto.getSid();
+        String deptSid = dto.getDeptSid();
+        SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
+        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+        dto.setUseOrgSid(useOrgSid);
+        dto.setUseOrgName(organizationVo.getName());
         if (StringUtils.isBlank(dtoSid)) {
+            //生成单据编号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            billNo = "QKCC" + organizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            dto.setBillNo(billNo);
             String sid = this.insertByDto(dto);
             return sid;
         }
@@ -169,6 +192,7 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
     public String insertByDto(AsArrearsoutApplyDto dto) {
         AsArrearsoutApply entity = new AsArrearsoutApply();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setNodeState("待提交");
         baseMapper.insert(entity);
         return entity.getSid();
     }
@@ -208,7 +232,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
         Map<String, Object> variables = new HashMap<>();
         //用户的部门全路径sid
-        bv.setOrgSidPath(asArrearsoutApply.getOrgSidPath());
+        SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asArrearsoutApply.getDeptSid()).getData();
+        bv.setOrgSidPath(deptVo.getOrgSidPath());
         //业务sid
         bv.setBusinessSid(businessSid);
         //用户sid
@@ -297,7 +322,9 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
         //=======================================
         bv.setFormVariables(variables);
-        bv.setOrgSidPath(asArrearsoutApply.getOrgSidPath());
+        //用户的部门全路径sid
+        SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asArrearsoutApply.getDeptSid()).getData();
+        bv.setOrgSidPath(deptVo.getOrgSidPath());
         if (bv.getTaskId().equals(asArrearsoutApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/billno/BillNo.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/billno/BillNo.java
new file mode 100644
index 0000000000..dcbdc4199e
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/billno/BillNo.java
@@ -0,0 +1,24 @@
+package com.yxt.anrui.as.feign.base.billno;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/1 9:46
+ * @Description
+ */
+@Data
+public class BillNo implements Serializable {
+    private static final long serialVersionUID = 1598887042562656350L;
+
+//    @ApiModelProperty(value = "品牌编码")
+//    private String brandCode;
+    @ApiModelProperty(value = "单据名称首字母")
+    private String billType;
+    @ApiModelProperty(value = "分公司编码")
+    private String orgCode;
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/billno/Rule.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/billno/Rule.java
new file mode 100644
index 0000000000..1a091519aa
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/billno/Rule.java
@@ -0,0 +1,44 @@
+package com.yxt.anrui.as.feign.base.billno;
+
+import cn.hutool.core.date.DateUtil;
+import org.springframework.util.StringUtils;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/1 9:44
+ * @Description 规则
+ */
+public class Rule {
+
+    /**
+     * 单据编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号
+     * 单据名称大写首字母+分公司编码+年份+月份
+     * 注意：品牌编码暂不用
+     *
+     * @return
+     */
+    public static String getBill(BillNo b) {
+        String billType = b.getBillType();
+        String orgCode = b.getOrgCode();
+        String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+        String bill = billType;
+        if (!StringUtils.isEmpty(orgCode)) {
+            bill = bill + orgCode;
+        }
+        bill = bill + date;
+        return bill;
+    }
+
+    /**
+     * 生成单据编号规则
+     *
+     * @param bill 单据名称大写首字母+分公司编码+年份+月份
+     * @param i    根据单据编号包含单据名称大写首字母+分公司编码+年份+月份查询出来的单据的个数
+     * @return
+     */
+    public static String getBillNo(String bill, int i) {
+        String num = String.format("%04d", i + 1); // 不足4位补0
+        String billNo = bill + num;
+        return billNo;
+    }
+}