diff --git a/anrui-scm/anrui-scm-ui/src/api/Common/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/Common/dictcommons.js
index 381f26f0b8..557a2a36d6 100644
--- a/anrui-scm/anrui-scm-ui/src/api/Common/dictcommons.js
+++ b/anrui-scm/anrui-scm-ui/src/api/Common/dictcommons.js
@@ -279,3 +279,12 @@ export function getAllTypeByAreaSid(data) {
     params: data
   })
 }
+
+// 获取售后服务--基础信息--供应商信息
+export function choiceSupplierInfo(data) {
+  return request({
+    url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo',
+    method: 'post',
+    params: data
+  })
+}
diff --git a/anrui-scm/anrui-scm-ui/src/api/disassemble/inventoryProfit.js b/anrui-scm/anrui-scm-ui/src/api/disassemble/inventoryProfit.js
new file mode 100644
index 0000000000..48cfbff382
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/api/disassemble/inventoryProfit.js
@@ -0,0 +1,148 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  //  盘点单详情
+  fetchDetailsBySid: function(params) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/fetchDetailsBySid/' + params,
+      method: 'get',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 根据部门sid 获取所有盘点单号
+  getSourceBillNoBySid: function(data) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/getSourceBillNoBySid',
+      method: 'post',
+      params: data
+    })
+  },
+  //  根据盘点单sid 获取商品
+  sourceBillBySid: function(params) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/sourceBillBySid/' + params,
+      method: 'get',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 保存盘盈入库
+  save: function(data) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/save',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 提交盘盈入库
+  submit: function(data) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/submit',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/complete',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/delegate',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/reject',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/breakProcess',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/wms/v1/wmsinventorysurplus/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}
diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
index f9f75754e2..485e59895a 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -1034,6 +1034,15 @@ const codemenu = [{
           noCache: true
         }
       },
+      {
+        path: '/inventoryProfit/inventoryProfit',
+        component: () => import('@/views/disassemble/inventoryProfit/inventoryProfit.vue'),
+        name: 'InventoryProfit',
+        meta: {
+          title: '盘盈入库',
+          noCache: true
+        }
+      },
     ]
   },
 
@@ -1509,6 +1518,28 @@ const codemenu = [{
     component: () =>
       import('@/views/workFlow/guachechukuFlow/chukuEdit.vue'),
     name: 'chukuEdit'
+  },
+
+  // 拆件盘盈入库申请待办详情页面
+  {
+    path: '/chaijianpanyingFlow/inventoryProfitDaiBan',
+    component: () =>
+      import('@/views/workFlow/chaijianpanyingFlow/inventoryProfitDaiBan.vue'),
+    name: 'InventoryProfitDaiBan'
+  },
+  // 拆件盘盈入库申请已办详情
+  {
+    path: '/chaijianpanyingFlow/inventoryProfitEdit',
+    component: () =>
+      import('@/views/workFlow/chaijianpanyingFlow/inventoryProfitEdit.vue'),
+    name: 'InventoryProfitEdit'
+  },
+  // 拆件盘盈入库申请办理
+  {
+    path: '/chaijianpanyingFlow/inventoryProfitYiBan',
+    component: () =>
+      import('@/views/workFlow/chaijianpanyingFlow/inventoryProfitYiBan.vue'),
+    name: 'InventoryProfitYiBan'
   }
 ]
 export default codemenu
diff --git a/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfit.vue b/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfit.vue
new file mode 100644
index 0000000000..6018d3673e
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfit.vue
@@ -0,0 +1,299 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="盘盈入库申请管理" :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 :inline="true" class="tab-header">
+              <el-form-item label="申请部门">
+                <el-input v-model="queryParams.params.deptName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据日期">
+                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="盘点单号">
+                <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">盘盈入库申请列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" align="center" width="150">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeState" label="流程状态" align="center" />
+            <el-table-column prop="billNo" label="单据编号" align="center" />
+            <el-table-column prop="deptName" label="申请部门" align="center" />
+            <el-table-column prop="createByName" label="申请人" align="center" />
+            <el-table-column prop="createTime" label="申请日期" align="center" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" />
+            <el-table-column prop="sourceBillNo" label="盘点单号" align="center" />
+            <el-table-column prop="businessType" label="业务类型" align="center" />
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <inventoryProfitAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="loadList" />
+    <inventoryProfitInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+
+  </div>
+</template>
+
+<script>
+import req from '@/api/disassemble/inventoryProfit'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import inventoryProfitAdd from './inventoryProfitAdd.vue'
+import inventoryProfitInfo from './inventoryProfitInfo.vue'
+export default {
+  name: 'InventoryProfit',
+  components: {
+    ButtonBar,
+    Pagination,
+    inventoryProfitAdd,
+    inventoryProfitInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      sids: [],
+      selectionList: [],
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        }, {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          sourceBillNo: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: '',
+          warehouseTypeKey: ''
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    this.loadList()
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'doDel':
+          this.doDel()
+          break
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    selectionLineChangeHandle(val) {
+      this.selectionList = val
+      const aa = []
+      val.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    loadList() {
+      this.tableLoading = true
+      this.queryParams.params.warehouseTypeKey = '03'
+      this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+      this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.queryParams.params.menuUrl = this.$route.path
+      req.listPage(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
+        } else {
+          // 根据resp.code进行异常情况处理
+          this.dataList = []
+          this.queryParams.total = 0
+        }
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          sourceBillNo: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: '',
+          warehouseTypeKey: ''
+        }
+      }
+      this.loadList()
+    },
+    doDel() {
+      if (this.sids.length > 0) {
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteBySids(this.sids).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({ type: 'success', message: resp.msg, showClose: true })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      } else {
+        this.$message({
+          showClose: true,
+          message: '请至少选择一条记录进行删除操作'
+        })
+      }
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit(row) {
+      this.viewState = 2
+      this.$refs['divAdd'].showEdit(row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfitAdd.vue b/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfitAdd.vue
new file mode 100644
index 0000000000..30bf0559ec
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfitAdd.vue
@@ -0,0 +1,332 @@
+<template>
+  <div>
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>{{ viewTitle }}</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <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>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+    <div class="listconadd">
+      <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="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty"><span class="icon">*</span> 盘点单号</div>
+            <el-form-item prop="sourceBillNo">
+              <el-select v-model="formobj.sourceBillNo" filterable clearable placeholder="请选择" class="addinputw addinputInfo" @change="selectSourceBillNo">
+                <el-option v-for="item in sourceBillNoList" :key="item.billSid" :label="item.billNo" :value="item.billSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable /></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">商品列表</div>
+        <el-table v-loading="listLoading" :data="formobj.goodsList" border>
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column fixed label="操作" wid align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doDelGoods(scope.$index)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品名称" prop="goodsName" align="center" />
+          <el-table-column label="商品编码" prop="goodsCode" align="center" />
+          <el-table-column label="规格" prop="goodsSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <el-table-column label="盘盈数量" prop="pyNum" align="center" />
+          <el-table-column label="供应商" align="center">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.supplierName" filterable clearable placeholder="请选择" @change="selectSupplierName(scope.row,$event)">
+                <el-option v-for="(item,i) in supplierList" :key="i" :label="item.supplierName" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="入库单价" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.inStoragePrice" @input="inputMoney(scope.row)" @keyup.native="scope.row.inStoragePrice = getNumber(scope.row.inStoragePrice, 2)" clearable placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column label="入库数量" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.inStorageNum" @input="inputMoney(scope.row)" @keyup.native="scope.row.inStorageNum = getNumber(scope.row.inStorageNum, 2)" clearable placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="money" label="金额" align="center" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/disassemble/inventoryProfit'
+import { getOrgSidByPath, choiceSupplierInfo } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'InventoryProfitAdd',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      listLoading: false,
+      submitdisabled: false,
+      supplierList: [],
+      sourceBillNoList: [],
+      formobj: {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        sourceBillNo: '',
+        sourceBillSid: '',
+        businessKey: '',
+        businessValue: '',
+        remarks: '',
+        warehouseTypeKey: '',
+        warehouseTypeValue: '',
+        orgPath: '',
+        goodsList: []
+      },
+      rules: {
+        sourceBillNo: [{ required: true, message: '请选择盘点单号', trigger: 'change' }]
+      }
+    }
+  },
+  methods: {
+    init() {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.formobj.createOrgSid = res.data
+          this.formobj.useOrgSid = res.data
+        }
+      })
+      choiceSupplierInfo({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+        if (resp.success) {
+          this.supplierList = resp.data
+        }
+      })
+      req.getSourceBillNoBySid({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1), warehouseTypeKey: '03' }).then((resp) => {
+        if (resp.success) {
+          this.sourceBillNoList = resp.data
+        }
+      })
+    },
+    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
+    },
+    showAdd() {
+      this.viewTitle = '【新增】盘盈入库申请单'
+      this.init()
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      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(),
+        hours: nowDate.getHours(),
+        minutes: nowDate.getMinutes(),
+        seconds: nowDate.getSeconds()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+      this.formobj.businessKey = '04'
+      this.formobj.businessValue = '盘盈入库'
+      this.formobj.warehouseTypeKey = '03'
+      this.formobj.warehouseTypeValue = '拆件库'
+    },
+    showEdit(row) {
+      this.init()
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '【编辑】盘盈入库申请单'
+      req.fetchDetailsBySid(row.sid).then(resp => {
+        if (resp.success) {
+          this.formobj = resp.data
+        }
+      }).catch(e => {
+        this.formobj = {}
+      })
+    },
+    selectSourceBillNo(val) {
+      const choose = this.sourceBillNoList.filter((item) => item.billSid === val)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.sourceBillNo = choose[0].billNo
+        this.formobj.sourceBillSid = choose[0].billSid
+        this.getSourceBillGoods(this.formobj.sourceBillSid)
+      } else {
+        this.formobj.sourceBillNo = ''
+        this.formobj.sourceBillSid = ''
+        this.formobj.goodsList = []
+      }
+    },
+    getSourceBillGoods(sid) {
+      req.sourceBillBySid(sid).then((resp) => {
+        if (resp.success) {
+          this.formobj.goodsList = resp.data
+        }
+      })
+    },
+    doDelGoods(index) {
+      this.formobj.goodsList.splice(index, 1)
+    },
+    selectSupplierName(row, val) {
+      const choose = this.supplierList.filter((item) => item.sid === val)
+      if (choose.length > 0 && choose !== null) {
+        row.supplierName = choose[0].supplierName
+        row.supplierSid = choose[0].sid
+      } else {
+        row.supplierName = ''
+        row.supplierSid = ''
+      }
+    },
+    // 金额 = 入库单价 * 入库数量
+    inputMoney(row) {
+      row.money = Math.round((parseFloat(row.inStoragePrice !== '' ? row.inStoragePrice : 0) * parseFloat(row.inStorageNum !== '' ? row.inStorageNum : 0)) * 100) / 100
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.save(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
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          if (this.formobj.goodsList.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+            return
+          } else {
+            for (var i = 0; i < this.formobj.goodsList.length; i++) {
+              var item = this.formobj.goodsList[i]
+              if (item.supplierName === '' || item.supplierSid === '') {
+                this.$message({ showClose: true, type: 'error', message: '供应商不能为空' })
+                return
+              }
+              if (Number(item.inStoragePrice) === 0) {
+                this.$message({ showClose: true, type: 'error', message: '商品入库单价不能为空且不能为零' })
+                return
+              }
+              if (Number(item.inStorageNum) === 0) {
+                this.$message({ showClose: true, type: 'error', message: '商品入库数量不能为空且不能为零' })
+                return
+              }
+            }
+          }
+          this.submitdisabled = true
+          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: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        sourceBillNo: '',
+        sourceBillSid: '',
+        businessKey: '',
+        businessValue: '',
+        remarks: '',
+        warehouseTypeKey: '',
+        warehouseTypeValue: '',
+        orgPath: '',
+        goodsList: []
+      }
+      this.submitdisabled = false
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    }
+  }
+}
+</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);
+}
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfitInfo.vue b/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfitInfo.vue
new file mode 100644
index 0000000000..56b621eff4
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/disassemble/inventoryProfit/inventoryProfitInfo.vue
@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>{{ viewTitle }}</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+    <div class="listconadd">
+      <el-form ref="form_obj" :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="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">盘点单号</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">商品列表</div>
+        <el-table v-loading="listLoading" :data="formobj.goodsList" border>
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column label="商品名称" prop="goodsName" align="center" />
+          <el-table-column label="商品编码" prop="goodsCode" align="center" />
+          <el-table-column label="规格" prop="goodsSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <el-table-column label="盘盈数量" prop="pyNum" align="center" />
+          <el-table-column label="供应商" prop="supplierName" align="center" />
+          <el-table-column label="入库单价" prop="inStoragePrice" align="center" />
+          <el-table-column label="入库数量" prop="inStorageNum" align="center" />
+          <el-table-column label="金额" prop="money" align="center" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/disassemble/inventoryProfit'
+
+export default {
+  name: 'InventoryProfitInfo',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      listLoading: false,
+      formobj: {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        sourceBillNo: '',
+        sourceBillSid: '',
+        businessKey: '',
+        businessValue: '',
+        remarks: '',
+        warehouseTypeKey: '',
+        warehouseTypeValue: '',
+        orgPath: '',
+        goodsList: []
+      }
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '盘盈入库申请详情'
+      req.fetchDetailsBySid(row.sid).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+        }
+      }).catch((e) => {
+        this.formobj = {}
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        sourceBillNo: '',
+        sourceBillSid: '',
+        businessKey: '',
+        businessValue: '',
+        remarks: '',
+        warehouseTypeKey: '',
+        warehouseTypeValue: '',
+        orgPath: '',
+        goodsList: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitDaiBan.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitDaiBan.vue
new file mode 100644
index 0000000000..ca7ba38404
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitDaiBan.vue
@@ -0,0 +1,398 @@
+<template>
+  <div>
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>{{ viewTitle }}</div>
+      <!-- start 添加修改按钮 -->
+      <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>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+    <div class="">
+      <el-form ref="form_obj" :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="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">盘点单号</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">商品列表</div>
+        <el-table v-loading="listLoading" :data="formobj.goodsList" border>
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column label="商品名称" prop="goodsName" align="center" />
+          <el-table-column label="商品编码" prop="goodsCode" align="center" />
+          <el-table-column label="规格" prop="goodsSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <el-table-column label="盘盈数量" prop="pyNum" align="center" />
+          <el-table-column label="供应商" prop="supplierName" align="center" />
+          <el-table-column label="入库单价" prop="inStoragePrice" align="center" />
+          <el-table-column label="入库数量" prop="inStorageNum" align="center" />
+          <el-table-column label="金额" prop="money" align="center" />
+        </el-table>
+      </el-form>
+    </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/disassemble/inventoryProfit'
+import { selectStaffListss } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'InventoryProfitDaiBan',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      listLoading: false,
+      formobj: {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        sourceBillNo: '',
+        sourceBillSid: '',
+        businessKey: '',
+        businessValue: '',
+        remarks: '',
+        warehouseTypeKey: '',
+        warehouseTypeValue: '',
+        orgPath: '',
+        goodsList: []
+      },
+      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: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '盘盈入库申请详情'
+      req.fetchDetailsBySid(sid).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+        }
+      }).catch((e) => {
+        this.formobj = {}
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
+    },
+    // 加签
+    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/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitEdit.vue
new file mode 100644
index 0000000000..bbc8c8af14
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitEdit.vue
@@ -0,0 +1,310 @@
+<template>
+  <div>
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>{{ viewTitle }}</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <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>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </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="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty"><span class="icon">*</span> 盘点单号</div>
+            <el-form-item prop="sourceBillNo">
+              <el-select v-model="formobj.sourceBillNo" filterable clearable placeholder="请选择" class="addinputw addinputInfo" @change="selectSourceBillNo">
+                <el-option v-for="item in sourceBillNoList" :key="item.billSid" :label="item.billNo" :value="item.billSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable /></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">商品列表</div>
+        <el-table v-loading="listLoading" :data="formobj.goodsList" border>
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column fixed label="操作" wid align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doDelGoods(scope.$index)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品名称" prop="goodsName" align="center" />
+          <el-table-column label="商品编码" prop="goodsCode" align="center" />
+          <el-table-column label="规格" prop="goodsSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <el-table-column label="盘盈数量" prop="pyNum" align="center" />
+          <el-table-column label="供应商" align="center">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.supplierName" filterable clearable placeholder="请选择" @change="selectSupplierName(scope.row,$event)">
+                <el-option v-for="(item,i) in supplierList" :key="i" :label="item.supplierName" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="入库单价" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.inStoragePrice" @input="inputMoney(scope.row)" @keyup.native="scope.row.inStoragePrice = getNumber(scope.row.inStoragePrice, 2)" clearable placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column label="入库数量" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.inStorageNum" @input="inputMoney(scope.row)" @keyup.native="scope.row.inStorageNum = getNumber(scope.row.inStorageNum, 2)" clearable placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="money" label="金额" align="center" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/disassemble/inventoryProfit'
+import { getOrgSidByPath, choiceSupplierInfo } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'InventoryProfitEdit',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      listLoading: false,
+      submitdisabled: false,
+      supplierList: [],
+      sourceBillNoList: [],
+      formobj: {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        sourceBillNo: '',
+        sourceBillSid: '',
+        businessKey: '',
+        businessValue: '',
+        remarks: '',
+        warehouseTypeKey: '',
+        warehouseTypeValue: '',
+        orgPath: '',
+        goodsList: []
+      },
+      rules: {
+        sourceBillNo: [{ required: true, message: '请选择盘点单号', trigger: 'change' }]
+      }
+    }
+  },
+  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: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    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
+    },
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '【编辑】盘盈入库申请单'
+      req.fetchDetailsBySid(sid).then(resp => {
+        if (resp.success) {
+          this.formobj = resp.data
+          getOrgSidByPath({ orgPath: this.formobj.orgPath }).then((res) => {
+            if (res.success) {
+              this.formobj.createOrgSid = res.data
+              this.formobj.useOrgSid = res.data
+            }
+          })
+          choiceSupplierInfo({ deptSid: this.formobj.deptSid }).then((resp) => {
+            if (resp.success) {
+              this.supplierList = resp.data
+            }
+          })
+          req.getSourceBillNoBySid({ deptSid: this.formobj.deptSid, warehouseTypeKey: '03' }).then((resp) => {
+            if (resp.success) {
+              this.sourceBillNoList = resp.data
+            }
+          })
+        }
+      }).catch(e => {
+        this.formobj = {}
+      })
+    },
+    selectSourceBillNo(val) {
+      const choose = this.sourceBillNoList.filter((item) => item.billSid === val)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.sourceBillNo = choose[0].billNo
+        this.formobj.sourceBillSid = choose[0].billSid
+        this.getSourceBillGoods(this.formobj.sourceBillSid)
+      } else {
+        this.formobj.sourceBillNo = ''
+        this.formobj.sourceBillSid = ''
+        this.formobj.goodsList = []
+      }
+    },
+    getSourceBillGoods(sid) {
+      req.sourceBillBySid(sid).then((resp) => {
+        if (resp.success) {
+          this.formobj.goodsList = resp.data
+        }
+      })
+    },
+    doDelGoods(index) {
+      this.formobj.goodsList.splice(index, 1)
+    },
+    selectSupplierName(row, val) {
+      const choose = this.supplierList.filter((item) => item.sid === val)
+      if (choose.length > 0 && choose !== null) {
+        row.supplierName = choose[0].supplierName
+        row.supplierSid = choose[0].sid
+      } else {
+        row.supplierName = ''
+        row.supplierSid = ''
+      }
+    },
+    // 金额 = 入库单价 * 入库数量
+    inputMoney(row) {
+      row.money = Math.round((parseFloat(row.inStoragePrice !== '' ? row.inStoragePrice : 0) * parseFloat(row.inStorageNum !== '' ? row.inStorageNum : 0)) * 100) / 100
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.save(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) {
+          if (this.formobj.goodsList.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+            return
+          } else {
+            for (var i = 0; i < this.formobj.goodsList.length; i++) {
+              var item = this.formobj.goodsList[i]
+              if (item.supplierName === '' || item.supplierSid === '') {
+                this.$message({ showClose: true, type: 'error', message: '供应商不能为空' })
+                return
+              }
+              if (Number(item.inStoragePrice) === 0) {
+                this.$message({ showClose: true, type: 'error', message: '商品入库单价不能为空且不能为零' })
+                return
+              }
+              if (Number(item.inStorageNum) === 0) {
+                this.$message({ showClose: true, type: 'error', message: '商品入库数量不能为空且不能为零' })
+                return
+              }
+            }
+          }
+          this.submitdisabled = true
+          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);
+}
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitYiBan.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitYiBan.vue
new file mode 100644
index 0000000000..1e0469715f
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/chaijianpanyingFlow/inventoryProfitYiBan.vue
@@ -0,0 +1,184 @@
+<template>
+  <div>
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>{{ viewTitle }}</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+    <div class="">
+      <el-form ref="form_obj" :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="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">盘点单号</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">商品列表</div>
+        <el-table v-loading="listLoading" :data="formobj.goodsList" border>
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column label="商品名称" prop="goodsName" align="center" />
+          <el-table-column label="商品编码" prop="goodsCode" align="center" />
+          <el-table-column label="规格" prop="goodsSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <el-table-column label="盘盈数量" prop="pyNum" align="center" />
+          <el-table-column label="供应商" prop="supplierName" align="center" />
+          <el-table-column label="入库单价" prop="inStoragePrice" align="center" />
+          <el-table-column label="入库数量" prop="inStorageNum" align="center" />
+          <el-table-column label="金额" prop="money" align="center" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/disassemble/inventoryProfit'
+
+export default {
+  name: 'InventoryProfitYiBan',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      listLoading: false,
+      formobj: {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        sourceBillNo: '',
+        sourceBillSid: '',
+        businessKey: '',
+        businessValue: '',
+        remarks: '',
+        warehouseTypeKey: '',
+        warehouseTypeValue: '',
+        orgPath: '',
+        goodsList: []
+      },
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  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: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '盘盈入库申请详情'
+      req.fetchDetailsBySid(sid).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+        }
+      }).catch((e) => {
+        this.formobj = {}
+      })
+    },
+    /** 确认撤回任务 */
+    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>