diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
index 63f89ab7d9..1c2913c10b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
@@ -389,7 +389,14 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                     List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid());
                     busSalesOrderVehicles.removeAll(Collections.singleton(null));
                     if (!busSalesOrderVehicles.isEmpty()) {
-                        List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
+                        List<String> stringVinNos = new ArrayList<>();
+                        for (BusSalesOrderVehicle v : busSalesOrderVehicles) {
+                            if (v.getLinkNo().length() > 8) {
+                                stringVinNos.add(v.getLinkNo().substring(v.getLinkNo().length() - 8));
+                            } else {
+                                stringVinNos.add(v.getLinkNo());
+                            }
+                        }
                         if (!stringVinNos.isEmpty()) {
                             record.setVinNo(String.join(",", stringVinNos));
                         }
@@ -406,7 +413,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                         //车辆数
                         BigDecimal vehCount = new BigDecimal(schedule.getVehCount());
                         if (StringUtils.isNotBlank(schedule.getIsDifferent())) {
-                            if (schedule.getIsDifferent().equals("是")) {
+                            if (schedule.getIsDifferent().equals("1")) {
                                 //判断是否有一台车不同月还金额
                                 //主产品期数
                                 BigDecimal mainPeriod = new BigDecimal(schedule.getMainPeriod());
@@ -437,6 +444,36 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                     record.setMainAmount(mainAmount.toString());
                                     record.setAmountAll(mainAmount.toString());
                                 }
+                            } else if (schedule.getIsDifferent().equals("0")) {
+                                //主产品期数
+                                BigDecimal mainPeriod = new BigDecimal(schedule.getMainPeriod());
+                                //主产品首期月还
+                                BigDecimal mainFirstRepay = schedule.getMainFirstRepay().multiply(vehCount);
+                                //主产品期间月还
+                                BigDecimal mainMidRepay = mainPeriod.subtract(new BigDecimal("2")).multiply(schedule.getMainMidRepay()).multiply(vehCount);
+                                //主产品末期月还
+                                BigDecimal mainLastRepay = schedule.getMainLastRepay().multiply(vehCount);
+                                mainAmount = mainFirstRepay.add(mainMidRepay).add(mainLastRepay);
+                                if (schedule.getIsOtherPolicy().equals("1")) {
+                                    //有其他融
+                                    //其他融期数
+                                    BigDecimal otherPeriod = new BigDecimal(schedule.getOtherPeriod());
+                                    //其他融首期月还
+                                    BigDecimal otherFirstRepay = schedule.getOtherFirstRepay().multiply(vehCount);
+                                    //其他融期间月还
+                                    BigDecimal otherMidRepay = otherPeriod.subtract(new BigDecimal("2")).multiply(schedule.getOtherMidRepay()).multiply(vehCount);
+                                    //其他融末期月还
+                                    BigDecimal otherLastRepay = schedule.getOtherLastRepay().multiply(vehCount);
+                                    otherAmount = otherFirstRepay.add(otherMidRepay).add(otherLastRepay);
+                                    amountAll = mainAmount.add(otherAmount);
+                                    record.setMainAmount(mainAmount.toString());
+                                    record.setOtherAmount(otherAmount.toString());
+                                    record.setAmountAll(amountAll.toString());
+                                } else if (schedule.getIsOtherPolicy().equals("0")) {
+                                    //没有其他融
+                                    record.setMainAmount(mainAmount.toString());
+                                    record.setAmountAll(mainAmount.toString());
+                                }
                             }
                         } else {
                             //主产品期数
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
index 7bc0b8f38a..ed77bdc3c6 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml
@@ -106,7 +106,7 @@
         SELECT
         @row_number := @row_number + 1 AS rankNo,
         p.loanContractSid,
-        p.createTime,
+        l.repaymentCreateTime as createTime,
         p.customer,
         p.staffName,
         p.borrowerName,
@@ -129,7 +129,9 @@
         p.dept,
         p.useOrgName
         FROM
-        loan_repayment_plan_details AS p,(
+        loan_repayment_plan_details AS p
+        LEFT JOIN anrui_buscenter.bus_sales_order_loancontract as l ON p.loanContractSid = l.sid
+        ,(
         SELECT
         @row_number := 0
         ) AS t
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
index b236fd690f..27f69405bb 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
@@ -106,7 +106,8 @@ public interface InvoicedFeign {
     public ResultBean saveInvoicedApplyInfoPdf(@RequestBody BillApplicationIInfoDto dto);
 
     @ApiOperation("出库开票点击生成附件")
-    @PostMapping("/saveInvoicedApplyInfo2Pdf")
+//    @PostMapping("/saveInvoicedApplyInfo2Pdf")
+    @PostMapping("/getInvoicedApply2Pdf")
     @ResponseBody
     public ResultBean saveInvoicedApplyInfo2Pdf(@Valid @RequestBody BillApplicationIInfoDto dto);
 
diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index fb5bbd78f3..ee917ad89e 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -411,8 +411,9 @@ BEGIN
                                                from anrui_buscenter.bus_sales_order bo
                                                         LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
                                                         left join anrui_buscenter.bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                                                        left join anrui_scm.scm_purchase_channel scc on scc.saleOrderSid = bo.sid
                                                WHERE bo.nodeState = '已办结'
-                                                 and bo.type = 3
+                                                 and bo.type = 3 and scc.state = 2
                                                GROUP BY bo.useOrgSid,
                                                         bm.modelSid,
                                                         bm.modelConfigSid,
diff --git a/yxt-as-ui/src/api/purchase/purchasereturn.js b/yxt-as-ui/src/api/purchase/purchasereturn.js
index e2956f49a3..b1252a3548 100644
--- a/yxt-as-ui/src/api/purchase/purchasereturn.js
+++ b/yxt-as-ui/src/api/purchase/purchasereturn.js
@@ -4,16 +4,16 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/pms/pmspurchasebackbill/listPage',
+      url: '/pms/v1/pmspurchasebackbill/listPage',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  // 查询分页列表 -- 供应商
-  supplierListPage: function(params) {
+  // 选择采购原单
+  choiceBillListPage: function(params) {
     return request({
-      url: '/base/basesupplierinfo/listPage',
+      url: '/pms/v1/pmspurchasebill/choiceBillListPage',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -22,42 +22,94 @@ export default {
   // 初始化
   fetchDetailsBySid: function(data) {
     return request({
-      url: '/pms/pmspurchasebackbill/fetchDetailsBySid/' + data,
+      url: '/pms/v1/pmspurchasebackbill/fetchDetailsBySid/' + data,
       method: 'get'
     })
   },
   saveOrUpdate: function(data) {
     return request({
-      url: '/pms/pmspurchasebillsettle/save',
+      url: '/pms/v1/pmspurchasebackbill/save',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  settlement: function(data) {
+  deleteBySids: function(data) {
     return request({
-      url: '/pms/pmspurchasebillsettle/save',
-      method: 'post',
+      url: '/pms/v1/pmspurchasebackbill/delBySids',
+      method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  deleteBySids: function(data) {
+  // 提交流程
+  submit: function(params) {
     return request({
-      url: '/pms/pmspurchasebackbill/delBySids',
-      method: 'DELETE',
-      data: data,
+      url: '/pms/v1/pmspurchasebackbill/submit',
+      method: 'post',
+      data: params,
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  // 导出
-  exportExcel: function(data) {
+  // 流程审批（同意）
+  complete: function(params) {
     return request({
-      url: '/pms/pmspurchasebackbill/exportExcel',
+      url: '/pms/v1/pmspurchasebackbill/complete',
       method: 'post',
-      responseType: 'blob', // 表明返回服务器返回的数据类型
-      data: data,
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/pms/v1/pmspurchasebackbill/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/pms/v1/pmspurchasebackbill/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/pms/v1/pmspurchasebackbill/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/pms/v1/pmspurchasebackbill/revokeProcess',
+      method: 'post',
+      data: params,
       headers: { 'Content-Type': 'application/json' }
     })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/pms/v1/pmspurchasebackbill/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/pms/v1/pmspurchasebackbill/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
   }
 }
diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index 2d5c3736bd..38ea46bfe1 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -442,6 +442,27 @@ export const constantRoutes = [{
       import('@/views/workFlow/caigouFlow/procurementYiBan.vue'),
     name: 'ProcurementYiBan'
   },
+  // 采购退货单管理--编辑
+  {
+    path: '/caigoutuihuoFlow/purchasereturnEdit',
+    component: () =>
+      import('@/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue'),
+    name: 'PurchaseReturnEdit'
+  },
+  // 采购退货单管理--待办
+  {
+    path: '/caigoutuihuoFlow/purchasereturnDaiBan',
+    component: () =>
+      import('@/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue'),
+    name: 'PurchaseReturnDaiBan'
+  },
+  // 采购退货单管理--已办
+  {
+    path: '/caigoutuihuoFlow/purchasereturnYiBan',
+    component: () =>
+      import('@/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue'),
+    name: 'PurchaseReturnYiBan'
+  },
   // 404 page must be placed at the end !!!
   // { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/yxt-as-ui/src/views/purchase/procurement/procurement.vue b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
index d259feb8b6..95945f0879 100644
--- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
@@ -33,17 +33,17 @@
               </el-form-item>
               <el-form-item label="采购类型">
                 <el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in procurementType_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                  <el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="采购原因">
                 <el-select v-model="listQuery.params.purchaseReasonValue" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in procurementReason_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                  <el-option v-for="item in procurementReason_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="付款方式">
                 <el-select v-model="listQuery.params.payTypeValue" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in paymentMethod_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                  <el-option v-for="item in paymentMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="供应商">
@@ -173,6 +173,7 @@ export default {
       sids: [], // 用于导出的时候保存已选择的SIDs
       procurementType_list: [],
       procurementReason_list: [],
+      paymentMethod_list: [],
       state_list: [
         {
           dictKey: '1',
diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
index ff724429d5..4685dc8625 100644
--- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
@@ -390,7 +390,7 @@ export default {
       this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
     },
     showEdit(row) {
-      this.viewTitle = '【新增】采购单'
+      this.viewTitle = '【编辑】采购单'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
index 0821658c73..cce0e35a13 100644
--- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
+++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
@@ -9,23 +9,48 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-form-item label="供应商">
-                <el-select v-model="listQuery.params.supplierSid" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
-                </el-select>
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="开单时间">
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
-              <!--              <el-form-item label="结算时间">-->
-              <!--                <el-date-picker v-model="listQuery.params.appealDueStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>-->
-              <!--                <span style="padding: 0 8px">至</span>-->
-              <!--                <el-date-picker v-model="listQuery.params.appealDueEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>-->
-              <!--              </el-form-item>-->
-              <el-form-item>
-                <el-input v-model="listQuery.params.otherQuery" placeholder="单号、备注" clearable/>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="采购单编号">
+                <el-input v-model="listQuery.params.sourceBillNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="采购类型">
+                <el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="采购原因">
+                <el-select v-model="listQuery.params.purchaseReasonValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in procurementReason_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="付款方式">
+                <el-select v-model="listQuery.params.payTypeValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in paymentMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="供应商">
+                <el-input v-model="listQuery.params.supplierName" placeholder="" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -36,7 +61,7 @@
         </div>
         <!--End查询列表部分-->
         <div class="listtop">
-          <div class="tit">采购退货列表</div>
+          <div class="tit">采购退货单列表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <!--Start 主页面主要部分 -->
@@ -44,18 +69,30 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50" />
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-            <el-table-column label="操作" width="180px" align="center">
+            <el-table-column label="操作" width="180" align="center">
               <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="billNo" label="单号" align="center" />
-            <el-table-column prop="supplierName" label="供应商" align="center" />
-            <el-table-column prop="supplierPhone" label="供应商联系方式" align="center" />
-            <el-table-column prop="purchaserName" label="采购员" align="center" />
-            <el-table-column prop="storekeeperName" label="库管员" align="center" />
-            <el-table-column prop="settleTime" label="结算时间" align="center" />
-            <el-table-column prop="createTime" label="创建时间" align="center" />
+            <el-table-column label="流程状态" width="180" header-align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
+                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" width="160" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
+            <el-table-column prop="sourceBillNo" label="采购单编号" align="center" width="120" />
+            <el-table-column prop="purchaseTypeValue" label="采购类型" align="center" width="100" />
+            <el-table-column prop="purchaseReasonValue" label="采购原因" align="center" width="100" />
+            <el-table-column prop="payTypeValue" label="付款方式" align="center" width="100" />
+            <el-table-column prop="supplierName" label="供应商" align="center" min-width="150" />
+            <el-table-column prop="backAmountCount" label="退货金额" align="center" width="120" />
+            <el-table-column prop="receivableAmount" label="应收金额" align="center" width="120" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
@@ -79,7 +116,8 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/purchase/purchasereturn'
-import { choiceSupplierInfo } from '@/api/Common/dictcommons'
+import { typeValues } from '@/api/Common/dictcommons'
+import { getStorage } from '@/utils/auth'
 import purchasereturnAdd from './purchasereturnAdd'
 import purchasereturnInfo from './purchasereturnInfo'
 
@@ -94,6 +132,9 @@ export default {
   },
   data() {
     return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
       btndisabled: false,
       btnList: [
         {
@@ -103,13 +144,6 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'edit',
-          btnKey: 'toEdit',
-          btnLabel: '编辑'
-        },
         {
           type: 'danger',
           size: 'small',
@@ -117,13 +151,6 @@ export default {
           btnKey: 'doDel',
           btnLabel: '删除'
         },
-        {
-          type: 'success',
-          size: 'small',
-          icon: 'export',
-          btnKey: 'doExport',
-          btnLabel: '导出'
-        },
         {
           type: 'info',
           size: 'small',
@@ -138,7 +165,9 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      supplier_list: [],
+      procurementType_list: [],
+      procurementReason_list: [],
+      paymentMethod_list: [],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -147,11 +176,20 @@ export default {
         size: 10,
         total: 0,
         params: {
-          supplierSid: '',
+          createOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
           createStartTime: '',
           createEndTime: '',
-          createOrgSid: '',
-          otherQuery: ''
+          finishStartTime: '',
+          finishEndTime: '',
+          sourceBillNo: '',
+          purchaseTypeValue: '',
+          purchaseReasonValue: '',
+          payTypeValue: '',
+          supplierName: '',
+          orgPath: ''
         }
       }
     }
@@ -162,16 +200,56 @@ export default {
     this.getList()
   },
   mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
     init() {
-      choiceSupplierInfo({ createOrgSid : '' }).then((res) => {
+      typeValues({ type: 'procurementType' }).then((res) => {
+        if (res.success) {
+          this.procurementType_list = res.data
+        }
+      })
+      typeValues({ type: 'procurementReason' }).then((res) => {
+        if (res.success) {
+          this.procurementReason_list = res.data
+        }
+      })
+      typeValues({ type: 'paymentMethod' }).then((res) => {
         if (res.success) {
-          this.supplier_list = res.data
+          this.paymentMethod_list = res.data
         }
       })
     },
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -187,15 +265,9 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
-        case 'toEdit':
-          this.toEdit()
-          break
         case 'doDel':
           this.doDel()
           break
-        case 'doExport':
-          this.doExport()
-          break
         case 'doClose':
           this.doClose()
           break
@@ -220,6 +292,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       req.listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
@@ -243,26 +316,31 @@ export default {
         size: 10,
         total: 0,
         params: {
-          supplierSid: '',
+          createOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
           createStartTime: '',
           createEndTime: '',
-          createOrgSid: '',
-          otherQuery: ''
+          finishStartTime: '',
+          finishEndTime: '',
+          sourceBillNo: '',
+          purchaseTypeValue: '',
+          purchaseReasonValue: '',
+          payTypeValue: '',
+          supplierName: '',
+          orgPath: ''
         }
       }
       this.init()
     },
     toAdd() {
       this.viewState = 2
-      this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
+      this.$refs['divAdd'].showAdd()
     },
     toEdit(row) {
-      if (this.sids.length === 1) {
-        this.viewState = 3
-        this.$refs['divAdd'].showEdit(this.sids[0])
-      } else {
-        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑操作' })
-      }
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
     },
     toInfo(row) {
       this.viewState = 4
@@ -297,31 +375,6 @@ export default {
       }).catch(() => {
       })
     },
-    doExport() {
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      req.exportExcel(this.listQuery.params).then((resp) => {
-        loading.close()
-        const blob = new Blob([resp], {
-          type: 'application/vnd.ms-excel'
-        })
-        const fileName = '销售单查询' + '.xls'
-        const elink = document.createElement('a')
-        elink.download = fileName
-        elink.style.display = 'nonde'
-        elink.href = URL.createObjectURL(blob)
-        document.body.appendChild(elink)
-        elink.click()
-        URL.revokeObjectURL(elink.href)
-        document.body.removeChild(elink)
-      }).catch(() => {
-        loading.close()
-      })
-    },
     // 修改、编辑、详情返回列表页面
     resetState() {
       this.viewState = 1
diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue
index d128df2195..e1515dab2e 100644
--- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue
+++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue
@@ -4,7 +4,9 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
-          <el-button type="danger" size="small" @click="settle()">结算</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="selectionList()">选择原单</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -12,168 +14,166 @@
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
             <el-col :span="8">
-              <div class="span-sty">单号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">制单人</div>
+              <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="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">原单信息</div>
+          <el-row>
+            <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><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购人</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">采购类型</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购原因</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">付款方式</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.payTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.supplierName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否开发票</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div v-show="originalmessage.isInvoicing == '1'">
+                <div class="span-sty">发票类型(税率)</div>
+                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
+              </div>
+            </el-col>
+          </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-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">款项情况</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">采购金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">运费</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">优惠金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">误差调整</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">应付金额</div>
+              <el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty"><span class="icon">*</span>已付金额</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.paidAmount" @keyup.native="formobj.paidAmount = getNumber(formobj.paidAmount, 2)" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">欠款</div>
+              <el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
             </el-col>
           </el-row>
           <div class="title titleOne">
-            <el-button type="primary" size="mini" class="btntopblueline" @click="selectYD">选取原单</el-button>
+            <div>商品列表</div>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="fullyWithdraw">整单全退</el-button>
           </div>
-          <el-table :key="tableReturnKey" v-show="formobj.pmsPurchasebackDetailList.length > 0" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
+          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="130" />
-            <el-table-column prop="goodsSkuCode" label="零件号" align="center" width="130" />
-            <el-table-column prop="unit" label="计量单位" align="center" width="100" />
-            <el-table-column prop="warehouse" label="仓库" align="center" width="130" />
-            <el-table-column prop="currentCount" label="库存数量" align="center" width="130" />
-            <el-table-column prop="cost" label="进价" align="center" width="100" />
-            <el-table-column prop="taxPrice" label="含税价" align="center" width="100" />
-            <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="amount" label="采购金额" align="center" width="100" />
-            <el-table-column prop="returnedCount" label="已退数量" align="center" width="100" />
-            <el-table-column label="退货数量" align="center" width="100">
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="count" label="采购数量" align="center" width="100" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
+            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
+            <el-table-column label="退货数量" align="center" min-width="100">
               <template slot-scope="scope">
-                <el-input @input="backCountInput(scope.row)" v-model="scope.row.backCount" clearable placeholder=""/>
+                <el-input @input="backAmountInput(scope.row)" @keyup.native="scope.row.backCount = getNumber(scope.row.backCount, 2)" v-model="scope.row.backCount" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column prop="backAmount" label="退货金额" align="center" width="100" />
+            <el-table-column prop="backAmount" label="退货金额" align="center" width="140" />
           </el-table>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">数量</div>
-              <el-form-item><span class="addinputInfo">{{ numTotal }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">合计含税金额</div>
-              <el-form-item><span class="addinputInfo">{{ hsjeTotal }} = 进价：{{ jjTotal }} + 税额：</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">退货金额</div>
-              <el-form-item><span class="addinputInfo">{{ thjeTotal }} = 合计含税金额：{{ hsjeTotal }} + 退误差调整：</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">应收金额</div>
-              <el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 退货金额：{{ thjeTotal }} - 退优惠：<el-input style="width: 100px" v-model="formobj.backDiscountAmount" clearable placeholder="" /> - 抵扣欠款：<el-input style="width: 100px" v-model="formobj.backDiscountAmount" clearable placeholder="" /></span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ ysTotal }} = 退货金额：{{ thTotal }} - 运费：<el-input @keyup.native="formobj.backFreight = getNumber(formobj.backFreight, 2)" v-model="formobj.backFreight" style="width: 160px" clearable placeholder="" /> - 退优惠：<el-input @keyup.native="formobj.backDiscountAmount = getNumber(formobj.backDiscountAmount, 2)" v-model="formobj.backDiscountAmount" style="width: 160px" clearable placeholder="" /> - 抵扣欠款：<el-input @keyup.native="formobj.deductDebts = getNumber(formobj.deductDebts, 2)" v-model="formobj.deductDebts" style="width: 160px" clearable placeholder="" />  + 误差调整：<el-input @keyup.native="formobj.backErrorAmount = getNumber(formobj.backErrorAmount, 2)" v-model="formobj.backErrorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
     </div>
-    <!-- 选取原单 -->
-    <el-dialog :visible="YDVisible" width="70%">
-      <el-form ref="multipleTable" :inline="true" :model="YDQuery" label-width="100px">
-        <el-form-item>
-          <el-input v-model="YDQuery.params.queryName" clearable style="width: 150px;" placeholder="制单人、单据编号"/>
-        </el-form-item>
-        <el-form-item label="开单时间">
-          <el-date-picker v-model="YDQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-          <span style="padding: 0 8px">至</span>
-          <el-date-picker v-model="YDQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="YDselect">查询</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table :key="YDKey" v-loading="YDLoading" :data="listByYD" border fit highlight-current-row style="width: 100%;">
-        <el-table-column fixed :index="YDindexMethod" align="center" label="序号" type="index" width="80"/>
-        <el-table-column fixed label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-button type="primary" size="small" @click="chooseYD(scope.row)">选择</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="billNo" label="单据编号" align="center" />
-        <el-table-column prop="customerName" label="客户名称" align="center" />
-        <el-table-column prop="vehMark" label="车辆拍照" align="center" />
-        <el-table-column prop="mobile" label="联系方式" align="center" />
-        <el-table-column prop="salesName" label="服务顾问" align="center" />
-        <el-table-column prop="state" label="单据状态" align="center" />
-        <el-table-column prop="settleTime" label="结算时间" align="center" />
-      </el-table>
-      <div class="pages">
-        <div class="tit"/>
-        <!-- 翻页 -->
-        <pagination v-show="YDQuery.length > 0" :limit.sync="YDQuery.size" :page.sync="YDQuery.current" :total="YDQuery.total" class="pagination" @pagination="getYDList"/>
-      </div>
-    </el-dialog>
-    <!-- 退货结算 -->
-    <el-dialog :visible.sync="settleVisible" width="70%">
-      <el-form :model="formobj" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #e0e3eb">
-          <el-col :span="8">
-            <div class="span-sty">应收金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.mobile}}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <div class="span-sty">转入预付款</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">结算方式</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.mobile" clearable placeholder="" /></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">结算金额</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.mobile" clearable placeholder="" /></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">结算时间</div>
-            <el-form-item><el-date-picker class="addinputInfo addinputw" v-model="formobj.mobile" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">其他结算方式</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.mobile" clearable placeholder="" /></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">其他结算金额</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.mobile" clearable placeholder="" /></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">欠款金额</div>
-<!--            <el-form-item><span class="addinputInfo">{{ debts }}</span></el-form-item>-->
-          </el-col>
-        </el-row>
-      </el-form>
-      <div style="text-align:center;margin-top: 20px;">
-        <el-button type="primary" size="mini" @click="confirm">确 定</el-button>
-        <el-button type="info " size="mini" @click="settleVisible = false">取 消</el-button>
-      </div>
-    </el-dialog>
+    <!-- 选择商品 -->
+    <originalorder v-show="viewState == 2" ref="divYd" @backData="backData" @doback="resetState" />
   </div>
 </template>
+
 <script>
-import Pagination from '@/components/pagination'
 import req from '@/api/purchase/purchasereturn'
+import { getOrgSidByPath } from '@/api/Common/dictcommons'
+import originalorder from './relation/originalorder'
 
 export default {
   name: 'PurchaseReturnAdd',
   components: {
-    Pagination
+    originalorder
   },
   data() {
     return {
       viewTitle: '',
       viewState: 1,
       submitdisabled: false,
-      settleVisible: false,
-      tableReturnKey: 0,
+      tableKey: 1,
       index: 0,
       formobj: {
         sid: '',
@@ -184,126 +184,228 @@ export default {
         sourceBillNo: '',
         billNo: '',
         backErrorAmount: '',
+        backFreight: '',
         backDiscountAmount: '',
         deductDebts: '',
         deductBillNo: '',
         toPrepayment: '',
+        payableAmount: '',
+        paidAmount: '',
+        receivableAmount: '',
+        deptSid: '',
+        deptName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
         useOrgSid: '',
+        useOrgName: '',
         createOrgSid: '',
+        createOrgName: '',
         pmsPurchasebackDetailList: []
       },
-      YDVisible: false,
-      YDKey: 2,
-      YDLoading: false,
-      listByYD: [],
-      YDQuery: {
-        current: 1,
-        size: 5,
-        total: 0,
-        params: {
-          queryName: '',
-          startDate: '',
-          endDate: '',
-          useOrgSid: ''
-        }
+      originalmessage: {
+        createTime: '',
+        purchaserName: '',
+        purchaseTypeValue: '',
+        purchaseReasonValue: '',
+        payTypeValue: '',
+        supplierName: '',
+        isInvoicing: '',
+        billType: '',
+        taxRate: '',
+        remarks: '',
+        freight: '',
+        amountCount: '',
+        discountAmount: '',
+        errorAmount: ''
       },
       rules: {}
     }
   },
   computed: {
-    // 计算数量
-    numTotal() {
-      let num = 0
+    // 数量
+    slTotal() {
+      let sl = '0'
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
-          num = Math.round((parseFloat(num) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+          if (e.goodsSpuName !== '') {
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+          }
         })
       }
-      return num
+      return sl
     },
-    // 计算进价
-    jjTotal() {
-      let jj = 0
+    // 退货金额
+    thTotal() {
+      let th = '0'
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
-          jj = Math.round((parseFloat(jj) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+          if (e.goodsSpuName !== '') {
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+          }
         })
       }
-      return jj
+      return th
     },
-    // 计算合计含税金额
-    hsjeTotal() {
-      let hsje = 0
-      if (this.jjTotal !== null) {
-        hsje = Math.round((parseFloat(hsje) + parseFloat(this.jjTotal !== '' ? this.jjTotal : '0')) * 100) / 100
-      }
-      return hsje
+    ysTotal() {
+      let ys = '0'
+      ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
+      return ys
     },
-    // 退货金额
-    thjeTotal() {
-      let thje = 0
-      if (this.hsjeTotal !== null) {
-        thje = Math.round((parseFloat(thje) + parseFloat(this.hsjeTotal !== '' ? this.hsjeTotal : '0')) * 100) / 100
-      }
-      return thje
+    // 应付金额 = 应付金额 - 退货单合计(退货金额 - 优惠 + 误差调整) - 运费 - 抵扣欠款
+    yfTotal() {
+      let yf = '0'
+      yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
+      return yf
     },
-    // 应收金额
-    ysjeTotal() {
-      let ysje = 0
-      if (this.thjeTotal !== null) {
-        ysje = Math.round((parseFloat(ysje) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
-      }
-      return ysje
+    // 欠款 = 应付金额 - 已付金额
+    qkTotal() {
+      let qk = '0'
+      qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
+      return qk
     }
   },
   methods: {
-    showAdd() {},
-    showEdit() {},
-    selectYD() {
-      this.YDVisible = true
-      this.getYDList()
+    init() {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.formobj.createOrgSid = res.data
+          this.formobj.useOrgSid = res.data
+        }
+      })
     },
-    YDindexMethod(index) {
-      var pagestart = (this.YDQuery.current - 1) * this.YDQuery.size
-      var pageindex = index + 1 + pagestart
-      return pageindex
+    showAdd() {
+      this.viewTitle = '【新增】采购退货单'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.init()
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.formobj.createByName = window.sessionStorage.getItem('name')
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+      this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
     },
-    getYDList() {
-      this.YDLoading = true
-      req.listPageReturn(this.YDQuery).then(response => {
-        this.YDLoading = false
-        if (response.success) {
-          this.listByYD = response.data.records
-          this.YDQuery.total = response.data.total
-        } else {
-          this.listByYD = []
-          this.YDQuery.total = 0
+    showEdit(row) {
+      this.viewTitle = '【编辑】采购退货单'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.init()
+      req.fetchDetailsBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+          this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
         }
       })
     },
-    YDselect() {
-      this.YDselect.current = 1
-      this.getYDList()
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
     },
-    chooseYD(row) {
-      this.YDVisible = false
-      // this.formobj
+    selectionList() {
+      this.viewState = 2
+      this.$refs['divYd'].showData(this.formobj.createOrgSid)
     },
-    // 计算退货金额
-    backCountInput(row) {
-      row.backAmount = Math((parseFloat(row.cost !== '' ? row.cost : '0') * parseFloat(row.backCount !== '' ? row.backCount : '0')) * 100) / 100
+    backData(value) {
+      this.viewState = 1
+      this.formobj.sourceBillNo = value.billNo
+      this.formobj.sourceBillSid = value.sid
+      this.formobj.payableAmount = value.payableAmount
+      const aa = []
+      if (value.pmsPurchaseBillDetailList.length > 0) {
+        value.pmsPurchaseBillDetailList.forEach((e) => {
+          aa.push({
+            sid: '',
+            billSid: '',
+            goodsSpuSid: e.goodsSpuSid,
+            goodsSpuName: e.goodsSpuName,
+            goodsSkuSid: e.goodsSkuSid,
+            goodsSkuTitle: e.goodsSkuTitle,
+            goodsSkuCode: e.goodsSkuCode,
+            goodsSkuOwnSpec: e.goodsSkuOwnSpec,
+            count: e.count,
+            amount: e.amount,
+            unit: e.unit,
+            warehouseSid: '',
+            warehouseName: '',
+            returnedCount: e.returnedCount,
+            backCount: '',
+            taxAmount: '',
+            taxPrice: e.taxPrice,
+            backAmount: ''
+          })
+        })
+      }
+      this.formobj.pmsPurchasebackDetailList = aa
+      this.originalmessage.createTime = value.createTime
+      this.originalmessage.purchaserName = value.purchaserName
+      this.originalmessage.purchaseTypeValue = value.purchaseTypeValue
+      this.originalmessage.purchaseReasonValue = value.purchaseReasonValue
+      this.originalmessage.payTypeValue = value.payTypeValue
+      this.originalmessage.supplierName = value.supplierName
+      this.originalmessage.isInvoicing = value.isInvoicing
+      this.originalmessage.billType = value.billType
+      this.originalmessage.taxRate = value.taxRate
+      this.originalmessage.amountCount = value.amountCount
+      this.originalmessage.freight = value.freight
+      this.originalmessage.discountAmount = value.discountAmount
+      this.originalmessage.errorAmount = value.errorAmount
     },
-    settle() {
-      this.settleVisible = true
-      this.formobj.settleVo.payableAmount = this.yfjeTotal
+    resetState() {
+      this.viewState = 1
     },
-    confirm() {
+    fullyWithdraw() {
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            // 计算退货数量 = 采购数量 - 已退数量
+            e.backCount = Math.round((parseFloat(e.count) - parseFloat(e.returnedCount !== '' ? e.returnedCount : '0')) * 100) / 100
+            // 计算退货金额
+            e.backAmount = Math.round((parseFloat(e.backCount) * parseFloat(e.taxPrice)) * 100) / 100
+          }
+        })
+      }
+    },
+    // 计算退货金额
+    backAmountInput(row) {
+      if (row.goodsSpuName !== '') {
+        row.backAmount = Math.round((parseFloat(row.taxPrice !== '' ? row.taxPrice : '0') * parseFloat(row.backCount !== '' ? row.backCount : '0')) * 100) / 100
+      }
+    },
+    saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
+          this.formobj.receivableAmount = this.ysTotal
           req.saveOrUpdate(this.formobj).then((res) => {
             if (res.success) {
-              this.$message({ showClose: true, type: 'success', message: '结算成功' })
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn('true')
             } else {
               this.submitdisabled = false
@@ -314,10 +416,60 @@ export default {
         }
       })
     },
-    handleReturn() {
-      this.formobj = {}
-      this.$emit('doback')
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          this.formobj.receivableAmount = this.ysTotal
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '提交成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
     },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billNo: '',
+        backErrorAmount: '',
+        backFreight: '',
+        backDiscountAmount: '',
+        deductDebts: '',
+        deductBillNo: '',
+        toPrepayment: '',
+        payableAmount: '',
+        paidAmount: '',
+        receivableAmount: '',
+        deptSid: '',
+        deptName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        useOrgSid: '',
+        useOrgName: '',
+        createOrgSid: '',
+        createOrgName: '',
+        pmsPurchasebackDetailList: []
+      }
+      this.submitdisabled = false
+      this.$emit('doback')
+    }
   }
 }
 </script>
@@ -329,4 +481,15 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue
index 042b708434..64e82d748e 100644
--- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue
+++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue
@@ -9,19 +9,138 @@
       </div>
       <div class="listconadd">
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-table :key="tableReturnKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </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.createTime }}</span></el-form-item>
+            </el-col>
+          </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>
+          <div class="title">原单信息</div>
+          <el-row>
+            <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><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购人</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">采购类型</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购原因</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">付款方式</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.payTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.supplierName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否开发票</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div v-show="originalmessage.isInvoicing == '1'">
+                <div class="span-sty">发票类型(税率)</div>
+                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">款项情况</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">采购金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">运费</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">优惠金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">误差调整</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">应付金额</div>
+              <el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty"><span class="icon">*</span>已付金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paidAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">欠款</div>
+              <el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">商品列表
+          </div>
+          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="130" />
-            <el-table-column prop="goodsSkuCode" label="零件号" align="center" width="130" />
-            <el-table-column prop="unit" label="计量单位" align="center" width="100" />
-            <el-table-column prop="warehouse" label="仓库" align="center" width="130" />
-            <el-table-column prop="currentCount" label="库存数量" align="center" width="130" />
-            <el-table-column prop="cost" label="进价" align="center" width="100" />
-            <el-table-column prop="taxPrice" label="含税价" align="center" width="100" />
-            <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="amount" label="采购金额" align="center" width="100" />
-            <el-table-column prop="returnedCount" label="已退数量" align="center" width="100" />
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="count" label="采购数量" align="center" width="100" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
+            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
+            <el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
+            <el-table-column prop="backAmount" label="退货金额" align="center" width="140" />
           </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">数量</div>
+              <el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">应收金额</div>
+              <el-form-item><span class="addinputInfo">{{ ysTotal }} = 退货金额：{{ thTotal }} - 运费：{{ formobj.backFreight }} - 退优惠：{{ formobj.backDiscountAmount }} - 抵扣欠款：{{ formobj.deductDebts }}  + 误差调整：{{ formobj.backErrorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>
@@ -37,7 +156,7 @@ export default {
     return {
       viewTitle: '',
       viewState: 1,
-      tableReturnKey: 0,
+      tableKey: 1,
       index: 0,
       formobj: {
         sid: '',
@@ -48,28 +167,152 @@ export default {
         sourceBillNo: '',
         billNo: '',
         backErrorAmount: '',
+        backFreight: '',
         backDiscountAmount: '',
         deductDebts: '',
         deductBillNo: '',
         toPrepayment: '',
+        payableAmount: '',
+        paidAmount: '',
+        receivableAmount: '',
+        deptSid: '',
+        deptName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
         useOrgSid: '',
+        useOrgName: '',
         createOrgSid: '',
+        createOrgName: '',
         pmsPurchasebackDetailList: []
       },
+      originalmessage: {
+        createTime: '',
+        purchaserName: '',
+        purchaseTypeValue: '',
+        purchaseReasonValue: '',
+        payTypeValue: '',
+        supplierName: '',
+        isInvoicing: '',
+        billType: '',
+        taxRate: '',
+        remarks: '',
+        amountCount: '',
+        freight: '',
+        discountAmount: '',
+        errorAmount: ''
+      },
       rules: {}
     }
   },
+  computed: {
+    // 数量
+    slTotal() {
+      let sl = '0'
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+          }
+        })
+      }
+      return sl
+    },
+    // 退货金额
+    thTotal() {
+      let th = '0'
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+          }
+        })
+      }
+      return th
+    },
+    ysTotal() {
+      let ys = '0'
+      ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
+      return ys
+    },
+    // 应付金额 = 应付金额 - 退货单合计(退货金额 - 优惠 + 误差调整) - 运费 - 抵扣欠款
+    yfTotal() {
+      let yf = '0'
+      yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
+      return yf
+    },
+    // 欠款 = 应付金额 - 已付金额
+    qkTotal() {
+      let qk = '0'
+      qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
+      return qk
+    }
+  },
   methods: {
     showInfo(row) {
       this.viewTitle = '采购退货单详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
       req.fetchDetailsBySid(row.sid).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
         }
       })
     },
-    handleReturn() {
-      this.formobj = {}
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billNo: '',
+        backErrorAmount: '',
+        backFreight: '',
+        backDiscountAmount: '',
+        deductDebts: '',
+        deductBillNo: '',
+        toPrepayment: '',
+        payableAmount: '',
+        paidAmount: '',
+        receivableAmount: '',
+        deptSid: '',
+        deptName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        useOrgSid: '',
+        useOrgName: '',
+        createOrgSid: '',
+        createOrgName: '',
+        pmsPurchasebackDetailList: []
+      }
+      this.originalmessage = {
+        createTime: '',
+        purchaserName: '',
+        purchaseTypeValue: '',
+        purchaseReasonValue: '',
+        payTypeValue: '',
+        supplierName: '',
+        isInvoicing: '',
+        billType: '',
+        taxRate: '',
+        remarks: '',
+        amountCount: '',
+        freight: '',
+        discountAmount: '',
+        errorAmount: ''
+      }
       this.$emit('doback')
     }
   }
@@ -77,5 +320,10 @@ export default {
 </script>
 
 <style scoped>
-
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/relation/originalorder.vue b/yxt-as-ui/src/views/purchase/purchasereturn/relation/originalorder.vue
new file mode 100644
index 0000000000..1dd094a527
--- /dev/null
+++ b/yxt-as-ui/src/views/purchase/purchasereturn/relation/originalorder.vue
@@ -0,0 +1,259 @@
+<template>
+  <div class="app-container">
+    <div>
+      <button-bar view-title="选择采购单" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header" label-width="100px">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="采购类型">
+                <el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in procurementType_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="采购原因">
+                <el-select v-model="listQuery.params.purchaseReasonValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in procurementReason_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="付款方式">
+                <el-select v-model="listQuery.params.payTypeValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in paymentMethod_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="供应商">
+                <el-input v-model="listQuery.params.supplierName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否开票">
+                <el-select v-model="listQuery.params.isInvoicing" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handresetting">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%">
+            <el-table-column width="60" fixed label="编号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" fixed width="80" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="small" @click="handleConfirm(scope.row)">确认</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" width="160" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
+            <el-table-column prop="purchaseTypeValue" label="采购类型" align="center" width="100" />
+            <el-table-column prop="purchaseReasonValue" label="采购原因" align="center" width="100" />
+            <el-table-column prop="payTypeValue" label="付款方式" align="center" width="100" />
+            <el-table-column prop="supplierName" label="供应商" align="center" min-width="150" />
+            <el-table-column prop="isInvoicing" label="是否开票" align="center" width="100" />
+            <el-table-column prop="amountCount" label="采购金额合计" align="center" width="140" />
+            <el-table-column prop="payableAmount" label="应付金额合计" align="center" width="140" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/purchase/purchasereturn'
+import { typeValues } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'OriginalOrder',
+  components: {
+    Pagination,
+    ButtonBar
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      procurementType_list: [],
+      procurementReason_list: [],
+      paymentMethod_list: [],
+      state_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '否'
+        }
+      ],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          createOrgName: '',
+          createOrgSid: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          purchaseTypeValue: '',
+          purchaseReasonValue: '',
+          payTypeValue: '',
+          supplierName: '',
+          isInvoicing: ''
+        },
+        total: 1
+      }
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'procurementType' }).then((res) => {
+        if (res.success) {
+          this.procurementType_list = res.data
+        }
+      })
+      typeValues({ type: 'procurementReason' }).then((res) => {
+        if (res.success) {
+          this.procurementReason_list = res.data
+        }
+      })
+      typeValues({ type: 'paymentMethod' }).then((res) => {
+        if (res.success) {
+          this.paymentMethod_list = res.data
+        }
+      })
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.choiceBillListPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.createOrgName = ''
+      this.listQuery.params.deptName = ''
+      this.listQuery.params.createByName = ''
+      this.listQuery.params.billNo = ''
+      this.listQuery.params.createStartTime = ''
+      this.listQuery.params.createEndTime = ''
+      this.listQuery.params.finishStartTime = ''
+      this.listQuery.params.finishEndTime = ''
+      this.listQuery.params.purchaseTypeValue = ''
+      this.listQuery.params.purchaseReasonValue = ''
+      this.listQuery.params.payTypeValue = ''
+      this.listQuery.params.supplierName = ''
+      this.listQuery.params.isInvoicing = ''
+      this.getList()
+    },
+    showData(createOrgSid) {
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.createOrgSid = createOrgSid
+      this.getList()
+    },
+    handleConfirm(row) {
+      this.$emit('backData', row)
+    },
+    // 返回
+    doClose() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue
new file mode 100644
index 0000000000..9d3cc68a9a
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue
@@ -0,0 +1,558 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="openCountersign('加签')">加 签</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </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.createTime }}</span></el-form-item>
+            </el-col>
+          </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>
+          <div class="title">原单信息</div>
+          <el-row>
+            <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><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购人</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">采购类型</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购原因</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">付款方式</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.payTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.supplierName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否开发票</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div v-show="originalmessage.isInvoicing == '1'">
+                <div class="span-sty">发票类型(税率)</div>
+                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">款项情况</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">采购金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">运费</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">优惠金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">误差调整</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">应付金额</div>
+              <el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty"><span class="icon">*</span>已付金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paidAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">欠款</div>
+              <el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">商品列表
+          </div>
+          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="count" label="采购数量" align="center" width="100" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
+            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
+            <el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
+            <el-table-column prop="backAmount" label="退货金额" align="center" width="140" />
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">数量</div>
+              <el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">应收金额</div>
+              <el-form-item><span class="addinputInfo">{{ ysTotal }} = 退货金额：{{ thTotal }} - 运费：{{ formobj.backFreight }} - 退优惠：{{ formobj.backDiscountAmount }} - 抵扣欠款：{{ formobj.deductDebts }}  + 误差调整：{{ formobj.backErrorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span class="icon">*</span>加签人员:
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <el-select v-model="countersign.assignee" placeholder="请选择" filterable>
+                <el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/purchase/purchasereturn'
+
+export default {
+  name: 'PurchaseReturnDaiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billNo: '',
+        backErrorAmount: '',
+        backFreight: '',
+        backDiscountAmount: '',
+        deductDebts: '',
+        deductBillNo: '',
+        toPrepayment: '',
+        payableAmount: '',
+        paidAmount: '',
+        receivableAmount: '',
+        deptSid: '',
+        deptName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        useOrgSid: '',
+        useOrgName: '',
+        createOrgSid: '',
+        createOrgName: '',
+        pmsPurchasebackDetailList: []
+      },
+      originalmessage: {
+        createTime: '',
+        purchaserName: '',
+        purchaseTypeValue: '',
+        purchaseReasonValue: '',
+        payTypeValue: '',
+        supplierName: '',
+        isInvoicing: '',
+        billType: '',
+        taxRate: '',
+        remarks: '',
+        amountCount: '',
+        freight: '',
+        discountAmount: '',
+        errorAmount: ''
+      },
+      rules: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  computed: {
+    // 数量
+    slTotal() {
+      let sl = '0'
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+          }
+        })
+      }
+      return sl
+    },
+    // 退货金额
+    thTotal() {
+      let th = '0'
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+          }
+        })
+      }
+      return th
+    },
+    ysTotal() {
+      let ys = '0'
+      ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
+      return ys
+    },
+    // 应付金额 = 应付金额 - 退货单合计(退货金额 - 优惠 + 误差调整) - 运费 - 抵扣欠款
+    yfTotal() {
+      let yf = '0'
+      yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
+      return yf
+    },
+    // 欠款 = 应付金额 - 已付金额
+    qkTotal() {
+      let qk = '0'
+      qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
+      return qk
+    }
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '采购退货单详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
+        }
+      })
+    },
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue
new file mode 100644
index 0000000000..2f6b762aaa
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue
@@ -0,0 +1,460 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="selectionList()">选择原单</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </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.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">原单信息</div>
+          <el-row>
+            <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><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购人</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">采购类型</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购原因</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">付款方式</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.payTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.supplierName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否开发票</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div v-show="originalmessage.isInvoicing == '1'">
+                <div class="span-sty">发票类型(税率)</div>
+                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">款项情况</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">采购金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">运费</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">优惠金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">误差调整</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">应付金额</div>
+              <el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty"><span class="icon">*</span>已付金额</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.paidAmount" @keyup.native="formobj.paidAmount = getNumber(formobj.paidAmount, 2)" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">欠款</div>
+              <el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>商品列表</div>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="fullyWithdraw">整单全退</el-button>
+          </div>
+          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="count" label="采购数量" align="center" width="100" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
+            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
+            <el-table-column label="退货数量" align="center" min-width="100">
+              <template slot-scope="scope">
+                <el-input @input="backAmountInput(scope.row)" @keyup.native="scope.row.backCount = getNumber(scope.row.backCount, 2)" v-model="scope.row.backCount" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="backAmount" label="退货金额" align="center" width="140" />
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">数量</div>
+              <el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">应收金额</div>
+              <el-form-item><span class="addinputInfo">{{ ysTotal }} = 退货金额：{{ thTotal }} - 运费：<el-input @keyup.native="formobj.backFreight = getNumber(formobj.backFreight, 2)" v-model="formobj.backFreight" style="width: 160px" clearable placeholder="" /> - 退优惠：<el-input @keyup.native="formobj.backDiscountAmount = getNumber(formobj.backDiscountAmount, 2)" v-model="formobj.backDiscountAmount" style="width: 160px" clearable placeholder="" /> - 抵扣欠款：<el-input @keyup.native="formobj.deductDebts = getNumber(formobj.deductDebts, 2)" v-model="formobj.deductDebts" style="width: 160px" clearable placeholder="" />  + 误差调整：<el-input @keyup.native="formobj.backErrorAmount = getNumber(formobj.backErrorAmount, 2)" v-model="formobj.backErrorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择商品 -->
+    <originalorder v-show="viewState == 2" ref="divYd" @backData="backData" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import req from '@/api/purchase/purchasereturn'
+import originalorder from './relation/originalorder'
+
+export default {
+  name: 'PurchaseReturnEdit',
+  components: {
+    originalorder
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billNo: '',
+        backErrorAmount: '',
+        backFreight: '',
+        backDiscountAmount: '',
+        deductDebts: '',
+        deductBillNo: '',
+        toPrepayment: '',
+        payableAmount: '',
+        paidAmount: '',
+        receivableAmount: '',
+        deptSid: '',
+        deptName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        useOrgSid: '',
+        useOrgName: '',
+        createOrgSid: '',
+        createOrgName: '',
+        pmsPurchasebackDetailList: []
+      },
+      originalmessage: {
+        createTime: '',
+        purchaserName: '',
+        purchaseTypeValue: '',
+        purchaseReasonValue: '',
+        payTypeValue: '',
+        supplierName: '',
+        isInvoicing: '',
+        billType: '',
+        taxRate: '',
+        remarks: '',
+        freight: '',
+        amountCount: '',
+        discountAmount: '',
+        errorAmount: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  computed: {
+    // 数量
+    slTotal() {
+      let sl = '0'
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+          }
+        })
+      }
+      return sl
+    },
+    // 退货金额
+    thTotal() {
+      let th = '0'
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+          }
+        })
+      }
+      return th
+    },
+    ysTotal() {
+      let ys = '0'
+      ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
+      return ys
+    },
+    // 应付金额 = 应付金额 - 退货单合计(退货金额 - 优惠 + 误差调整) - 运费 - 抵扣欠款
+    yfTotal() {
+      let yf = '0'
+      yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
+      return yf
+    },
+    // 欠款 = 应付金额 - 已付金额
+    qkTotal() {
+      let qk = '0'
+      qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
+      return qk
+    }
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '【编辑】采购退货单'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+          this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
+        }
+      })
+    },
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
+    selectionList() {
+      this.viewState = 2
+      this.$refs['divYd'].showData(this.formobj.createOrgSid)
+    },
+    backData(value) {
+      this.viewState = 1
+      this.formobj.sourceBillNo = value.billNo
+      this.formobj.sourceBillSid = value.sid
+      this.formobj.payableAmount = value.payableAmount
+      const aa = []
+      if (value.pmsPurchaseBillDetailList.length > 0) {
+        value.pmsPurchaseBillDetailList.forEach((e) => {
+          aa.push({
+            sid: '',
+            billSid: '',
+            goodsSpuSid: e.goodsSpuSid,
+            goodsSpuName: e.goodsSpuName,
+            goodsSkuSid: e.goodsSkuSid,
+            goodsSkuTitle: e.goodsSkuTitle,
+            goodsSkuCode: e.goodsSkuCode,
+            goodsSkuOwnSpec: e.goodsSkuOwnSpec,
+            count: e.count,
+            amount: e.amount,
+            unit: e.unit,
+            warehouseSid: '',
+            warehouseName: '',
+            returnedCount: e.returnedCount,
+            backCount: '',
+            taxAmount: '',
+            taxPrice: e.taxPrice,
+            backAmount: ''
+          })
+        })
+      }
+      this.formobj.pmsPurchasebackDetailList = aa
+      this.originalmessage.createTime = value.createTime
+      this.originalmessage.purchaserName = value.purchaserName
+      this.originalmessage.purchaseTypeValue = value.purchaseTypeValue
+      this.originalmessage.purchaseReasonValue = value.purchaseReasonValue
+      this.originalmessage.payTypeValue = value.payTypeValue
+      this.originalmessage.supplierName = value.supplierName
+      this.originalmessage.isInvoicing = value.isInvoicing
+      this.originalmessage.billType = value.billType
+      this.originalmessage.taxRate = value.taxRate
+      this.originalmessage.amountCount = value.amountCount
+      this.originalmessage.freight = value.freight
+      this.originalmessage.discountAmount = value.discountAmount
+      this.originalmessage.errorAmount = value.errorAmount
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    fullyWithdraw() {
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            // 计算退货数量 = 采购数量 - 已退数量
+            e.backCount = Math.round((parseFloat(e.count) - parseFloat(e.returnedCount !== '' ? e.returnedCount : '0')) * 100) / 100
+            // 计算退货金额
+            e.backAmount = Math.round((parseFloat(e.backCount) * parseFloat(e.taxPrice)) * 100) / 100
+          }
+        })
+      }
+    },
+    // 计算退货金额
+    backAmountInput(row) {
+      if (row.goodsSpuName !== '') {
+        row.backAmount = Math.round((parseFloat(row.taxPrice !== '' ? row.taxPrice : '0') * parseFloat(row.backCount !== '' ? row.backCount : '0')) * 100) / 100
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          this.formobj.receivableAmount = this.ysTotal
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          this.formobj.receivableAmount = this.ysTotal
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '提交成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    }
+  }
+}
+</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);
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue
new file mode 100644
index 0000000000..4ceb3da82d
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue
@@ -0,0 +1,350 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </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.createTime }}</span></el-form-item>
+            </el-col>
+          </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>
+          <div class="title">原单信息</div>
+          <el-row>
+            <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><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购人</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">采购类型</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购原因</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">付款方式</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.payTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.supplierName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否开发票</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div v-show="originalmessage.isInvoicing == '1'">
+                <div class="span-sty">发票类型(税率)</div>
+                <el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">款项情况</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">采购金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">运费</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">优惠金额</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">误差调整</div>
+              <el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">应付金额</div>
+              <el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty"><span class="icon">*</span>已付金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paidAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">欠款</div>
+              <el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">商品列表
+          </div>
+          <el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="count" label="采购数量" align="center" width="100" />
+            <el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == '1'" label="含税单价" align="center"  min-width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价" align="center"  min-width="150" />
+            <el-table-column prop="amount" label="采购金额" align="center" width="140" />
+            <el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
+            <el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
+            <el-table-column prop="backAmount" label="退货金额" align="center" width="140" />
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">数量</div>
+              <el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">应收金额</div>
+              <el-form-item><span class="addinputInfo">{{ ysTotal }} = 退货金额：{{ thTotal }} - 运费：{{ formobj.backFreight }} - 退优惠：{{ formobj.backDiscountAmount }} - 抵扣欠款：{{ formobj.deductDebts }}  + 误差调整：{{ formobj.backErrorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/purchase/purchasereturn'
+
+export default {
+  name: 'PurchaseReturnYiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billNo: '',
+        backErrorAmount: '',
+        backFreight: '',
+        backDiscountAmount: '',
+        deductDebts: '',
+        deductBillNo: '',
+        toPrepayment: '',
+        payableAmount: '',
+        paidAmount: '',
+        receivableAmount: '',
+        deptSid: '',
+        deptName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        useOrgSid: '',
+        useOrgName: '',
+        createOrgSid: '',
+        createOrgName: '',
+        pmsPurchasebackDetailList: []
+      },
+      originalmessage: {
+        createTime: '',
+        purchaserName: '',
+        purchaseTypeValue: '',
+        purchaseReasonValue: '',
+        payTypeValue: '',
+        supplierName: '',
+        isInvoicing: '',
+        billType: '',
+        taxRate: '',
+        remarks: '',
+        amountCount: '',
+        freight: '',
+        discountAmount: '',
+        errorAmount: ''
+      },
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  computed: {
+    // 数量
+    slTotal() {
+      let sl = '0'
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+          }
+        })
+      }
+      return sl
+    },
+    // 退货金额
+    thTotal() {
+      let th = '0'
+      if (this.formobj.pmsPurchasebackDetailList.length > 0) {
+        this.formobj.pmsPurchasebackDetailList.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+          }
+        })
+      }
+      return th
+    },
+    ysTotal() {
+      let ys = '0'
+      ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
+      return ys
+    },
+    // 应付金额 = 应付金额 - 退货单合计(退货金额 - 优惠 + 误差调整) - 运费 - 抵扣欠款
+    yfTotal() {
+      let yf = '0'
+      yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
+      return yf
+    },
+    // 欠款 = 应付金额 - 已付金额
+    qkTotal() {
+      let qk = '0'
+      qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
+      return qk
+    }
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '采购退货单详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
+        }
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/relation/originalorder.vue b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/relation/originalorder.vue
new file mode 100644
index 0000000000..aecf6adb77
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/relation/originalorder.vue
@@ -0,0 +1,259 @@
+<template>
+  <div class="app-container">
+    <div>
+      <button-bar view-title="选择采购单" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header" label-width="100px">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="采购类型">
+                <el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in procurementType_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="采购原因">
+                <el-select v-model="listQuery.params.purchaseReasonValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in procurementReason_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="付款方式">
+                <el-select v-model="listQuery.params.payTypeValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in paymentMethod_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="供应商">
+                <el-input v-model="listQuery.params.supplierName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否开票">
+                <el-select v-model="listQuery.params.isInvoicing" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handresetting">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%">
+            <el-table-column width="60" fixed label="编号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" fixed width="80" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="small" @click="handleConfirm(scope.row)">确认</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" width="160" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
+            <el-table-column prop="purchaseTypeValue" label="采购类型" align="center" width="100" />
+            <el-table-column prop="purchaseReasonValue" label="采购原因" align="center" width="100" />
+            <el-table-column prop="payTypeValue" label="付款方式" align="center" width="100" />
+            <el-table-column prop="supplierName" label="供应商" align="center" min-width="150" />
+            <el-table-column prop="isInvoicing" label="是否开票" align="center" width="100" />
+            <el-table-column prop="amountCount" label="采购金额合计" align="center" width="140" />
+            <el-table-column prop="payableAmount" label="应付金额合计" align="center" width="140" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/purchase/purchasereturn'
+import { typeValues } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'OriginalOrder',
+  components: {
+    Pagination,
+    ButtonBar
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      procurementType_list: [],
+      procurementReason_list: [],
+      paymentMethod_list: [],
+      state_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '否'
+        }
+      ],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          createOrgName: '',
+          createOrgSid: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          purchaseTypeValue: '',
+          purchaseReasonValue: '',
+          payTypeValue: '',
+          supplierName: '',
+          isInvoicing: ''
+        },
+        total: 1
+      }
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'procurementType' }).then((res) => {
+        if (res.success) {
+          this.procurementType_list = res.data
+        }
+      })
+      typeValues({ type: 'procurementReason' }).then((res) => {
+        if (res.success) {
+          this.procurementReason_list = res.data
+        }
+      })
+      typeValues({ type: 'paymentMethod' }).then((res) => {
+        if (res.success) {
+          this.paymentMethod_list = res.data
+        }
+      })
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.choiceBillListPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.createOrgName = ''
+      this.listQuery.params.deptName = ''
+      this.listQuery.params.createByName = ''
+      this.listQuery.params.billNo = ''
+      this.listQuery.params.createStartTime = ''
+      this.listQuery.params.createEndTime = ''
+      this.listQuery.params.finishStartTime = ''
+      this.listQuery.params.finishEndTime = ''
+      this.listQuery.params.purchaseTypeValue = ''
+      this.listQuery.params.purchaseReasonValue = ''
+      this.listQuery.params.payTypeValue = ''
+      this.listQuery.params.supplierName = ''
+      this.listQuery.params.isInvoicing = ''
+      this.getList()
+    },
+    showData(createOrgSid) {
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.createOrgSid = createOrgSid
+      this.getList()
+    },
+    handleConfirm(row) {
+      this.$emit('backData', row)
+    },
+    // 返回
+    doClose() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>