diff --git a/src/api/yieldReport/com_show_transformed_roll.js b/src/api/yieldReport/com_show_transformed_roll.js
new file mode 100644
index 0000000..bcf18c9
--- /dev/null
+++ b/src/api/yieldReport/com_show_transformed_roll.js
@@ -0,0 +1,15 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+// 获取转换物料的BOM信息
+export const getTransformOrderBomData = data => createAPI('scheduling/getTransformOrderBomData', 'POST', data)
+
+//获取转换物料的扫描卷信息
+export const getTransformRollTable = data => createAPI('scheduling/getTransformedRollTable', 'POST', data)
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/yieldReport/com_show_transformed_roll.vue b/src/views/modules/yieldReport/com_show_transformed_roll.vue
new file mode 100644
index 0000000..6867b07
--- /dev/null
+++ b/src/views/modules/yieldReport/com_show_transformed_roll.vue
@@ -0,0 +1,311 @@
+<template>
+  <div class="customer-css">
+    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
+               width="720px" style="height: 485px;" class="customer-dialog">
+      <el-form :inline="true" label-position="top" style="height: 350px;"
+               label-width="80px">
+        <!-- 菜单信息 -->
+        <el-row>
+          <el-col :span="5" >
+            <el-form-item :label="'物料编码:'">
+              <el-input v-model="pageData.partNo" readonly="readonly" style="width: 120px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7" >
+            <el-form-item :label="'物料描述:'">
+              <el-input v-model="pageData.partDesc" readonly="readonly" style="width: 180px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5" >
+            <el-form-item :label="'原物料编码:'">
+              <el-input v-model="pageData.oriPartNo" readonly="readonly" style="width: 120px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7" >
+            <el-form-item :label="'原物料描述:'">
+              <el-input v-model="pageData.oriPartDesc" readonly="readonly" style="width: 180px"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 主材料 -->
+        <el-form>
+          <fieldset class="customer-fieldset" style="width: 695px;">
+            <legend>入库卷列表</legend>
+            <el-table height="265"
+              :data="transformPartList"
+              border
+              v-loading="dataListLoading"
+              style="width: 100%; margin-top: -5px;">
+              <el-table-column
+                v-for="(item,index) in transformPartColumns" :key="index"
+                :sortable="item.columnSortable"
+                :prop="item.columnProp"
+                :header-align="item.headerAlign"
+                :show-overflow-tooltip="item.showOverflowTooltip"
+                :align="item.align"
+                :fixed="item.fixed"
+                :width="item.columnWidth"
+                :label="item.columnLabel">
+                <template slot-scope="scope">
+                  <el-input type="number" class="table-input" align="right" v-if="item.columnHidden"
+                            v-model="scope.row[item.columnProp]"></el-input>
+                  <span v-else>{{scope.row[item.columnProp]}}</span>
+                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                     style="width: 100px; height: 80px"/></span>
+
+                </template>
+              </el-table-column>
+            </el-table>
+          </fieldset>
+        </el-form>
+      </el-form>
+
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTransformOrderBomData,
+  getTransformRollTable,
+} from '@/api/yieldReport/com_show_transformed_roll.js';
+export default {
+  data() {
+    return {
+      titleCon: '已入库卷清单',
+      pageData: {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        orderNo: '',
+        itemNo: 0,
+        rollNo: '',
+        oriPartNo: '',
+        oriPartDesc: '',
+        partNo: '',
+        partDesc: '',
+        transType: 'sw-part',
+        status: 'Y',
+      },
+      bomData: {},
+      transformPartList: [],
+      transformPartColumns: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5305,
+          serialNumber: '5305TransRollSortNo',
+          tableId: "5305TransRoll",
+          tableName: "转换卷号",
+          columnProp: "sortNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "序号",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5305,
+          serialNumber: '5305TransRollRollNo',
+          tableId: "5305TransRoll",
+          tableName: "转换卷号",
+          columnProp: "rollNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "卷号",
+          columnWidth: 125,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5305,
+          serialNumber: '5305TransRollRollDate',
+          tableId: "5305TransRoll",
+          tableName: "转换卷号",
+          columnProp: "rollDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "卷日期",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5305,
+          serialNumber: '5305TransRollRollQty',
+          tableId: "5305TransRoll",
+          tableName: "转换卷号",
+          columnProp: "rollQty",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "卷数量",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5305,
+          serialNumber: '5305TransRollOriRollNo',
+          tableId: "5305TransRoll",
+          tableName: "转换卷号",
+          columnProp: "oriRollNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "原卷号",
+          columnWidth: 125,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5305,
+          serialNumber: '5305TransRollCreatedDate',
+          tableId: "5305TransRoll",
+          tableName: "转换卷号",
+          columnProp: "createdDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "录入时间",
+          columnWidth: 130,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5305,
+          serialNumber: '5305TransRollCreatedBy',
+          tableId: "5305TransRoll",
+          tableName: "转换卷号",
+          columnProp: "createdBy",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "录入人",
+          columnWidth: 85,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+      ],
+      dataListLoading: false,
+    }
+  },
+  methods: {
+    /*初始化页面参数*/
+    init(transformOrder) {
+      //设置参数
+      this.pageData.orderNo = transformOrder.orderNo;
+      this.pageData.itemNo = transformOrder.orderItemNo;
+      this.pageData.partNo = transformOrder.partNo;
+      this.pageData.partDesc = transformOrder.partDescription;
+      this.pageData.oriPartNo = '';
+      this.pageData.oriPartDesc = '';
+      //获取BOM的信息
+      this.refreshTransformOrderBomData();
+      //刷新当前派工单的信息
+      this.refreshPageTableData();
+    },
+
+    /*关闭modal*/
+    closeDialog(){
+      this.$emit('update:visible', false);
+    },
+
+    /*刷新当前的页面参数*/
+    refreshPageTableData(){
+      //刷新材料的数据
+      this.refreshTransformRollTable();
+    },
+
+    //刷新当前卷的时间数据
+    refreshTransformRollTable(){
+      //清空卷号
+      this.pageData.rollNo = '';
+      getTransformRollTable(this.pageData).then(({data}) => {
+        this.transformPartList = data.rows;
+      });
+    },
+
+    //刷新当前卷的时间数据
+    refreshTransformOrderBomData(){
+      //查询当前的页面表格
+      getTransformOrderBomData(this.pageData).then(({data}) => {
+        this.bomData = data.row;
+        //参数赋值
+        this.pageData.oriPartNo = data.row.partNo;
+        this.pageData.oriPartDesc = data.row.partDesc;
+      });
+    },
+
+
+  },
+  created() {
+    //
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+/*调节页面button和input的上下间距*/
+.customer-css .customer-button{
+  margin-top: 25px;
+}
+
+/*调节样式*/
+.customer-item{
+  margin-top: -10px;
+}
+/*fieldset下table的样式*/
+.customer-fieldset /deep/ .el-table__header th.is-leaf{
+  line-height: 16px;
+}
+
+/deep/ .customer-tab .el-tabs__content{
+  padding: 0px !important;
+}
+
+/*table中input 修改样式*/
+/deep/ div.table-input {
+  padding: 0px 0px;
+  height: 25px !important;
+}
+/*table中input*/
+div.table-input /deep/ input.el-input__inner{
+  padding: 0px 0px;
+  height: 23px !important;
+  text-align: right;
+}
+
+
+</style>
diff --git a/src/views/modules/yieldReport/com_transform_part.vue b/src/views/modules/yieldReport/com_transform_part.vue
index c619f0e..9eab6d6 100644
--- a/src/views/modules/yieldReport/com_transform_part.vue
+++ b/src/views/modules/yieldReport/com_transform_part.vue
@@ -255,6 +255,13 @@ export default {
 
     //扫描卷号
     scanTransformOrderRollNo(){
+      //清空空格
+      this.pageData.rollNo = this.pageData.rollNo.trim();
+      //判断扫描是否存在
+      if(this.pageData.rollNo == null || this.pageData.rollNo == ''){
+        this.$message.error('卷号不能为空!')
+        return false;
+      }
       scanTransformPartRollNo(this.pageData).then(({data}) => {
         //判断操作是否成功
         if(data.code == 500){
@@ -290,7 +297,6 @@ export default {
     },
 
 
-
   },
   created() {
     //
diff --git a/src/views/modules/yieldReport/order_transform_part.vue b/src/views/modules/yieldReport/order_transform_part.vue
index fcdd19c..3235892 100644
--- a/src/views/modules/yieldReport/order_transform_part.vue
+++ b/src/views/modules/yieldReport/order_transform_part.vue
@@ -53,10 +53,11 @@
       <el-table-column
         header-align="center"
         align="center"
-        width="70"
+        width="120"
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="transformPartModal(scope.row)">转换</a>
+          <a type="text" size="small" @click="showTransformedRollModal(scope.row)">已入库列表</a>
         </template>
       </el-table-column>
       <el-table-column
@@ -76,18 +77,27 @@
         </template>
       </el-table-column>
     </el-table>
-    <!-- 分切报工的组件 -->
+    <!-- 转换物料的组件 -->
     <comTransformPart ref="comTransformPart" :close-on-click-modal="false"
                          :visible.sync="showTransformPartFlag"
                       @refreshPageTables="refreshPageTables">
 
     </comTransformPart>
+
+    <!-- 转换物料的卷列表组件 -->
+    <comShowTransformedRoll ref="comShowTransformedRoll" :close-on-click-modal="false"
+                      :visible.sync="showTransformedRollFlag">
+
+    </comShowTransformedRoll>
   </div>
 </template>
 
 <script>
 /*组件*/
 import comTransformPart from "./com_transform_part";/*转换物料*/
+import comShowTransformedRoll from "./com_show_transformed_roll";/*展示转换物料卷列表*/
+
+
 import {
   searchSapTransformOrder,
 } from "@/api/yieldReport/order_transform_part.js"
@@ -97,6 +107,7 @@ export default {
     return {
       tagNo:'',
       showTransformPartFlag: false,
+      showTransformedRollFlag: false,
       currentRow: {},
       // 导出 start
       exportData: [],
@@ -359,6 +370,7 @@ export default {
   /*组件*/
   components: {
     comTransformPart, /*换物料*/
+    comShowTransformedRoll,/*展示转换物料卷列表*/
   },
 
   mounted() {
@@ -404,6 +416,15 @@ export default {
     },
 
 
+    /*转换物料*/
+    showTransformedRollModal(currentRow){
+      this.currentRow = currentRow;
+      //打开转换料
+      this.$nextTick(() => {
+        this.showTransformedRollFlag = true;
+        this.$refs.comShowTransformedRoll.init(this.currentRow);
+      });
+    },