diff --git a/package-lock.json b/package-lock.json
index ee44224..82b486f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3526,6 +3526,11 @@
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
       "dev": true
     },
+    "dayjs": {
+      "version": "1.10.7",
+      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.7.tgz",
+      "integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg="
+    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
diff --git a/src/api/purchasingManagement/materialSplit.js b/src/api/purchasingManagement/materialSplit.js
index 3e1e945..35efd46 100644
--- a/src/api/purchasingManagement/materialSplit.js
+++ b/src/api/purchasingManagement/materialSplit.js
@@ -31,8 +31,13 @@ export const getTransRoll = data => createAPI(`materialSplit/getTransRoll`,'POST
 export const checkRollNo = data => createAPI(`materialSplit/checkRollNo`,'POST',data)
 
 export const saveFinishRoll= data => createAPI(`materialSplit/saveFinishRoll`,'POST',data)
+export const checkFinishRoll= data => createAPI(`materialSplit/checkFinishRoll`,'POST',data)
 
 
 
+export const searchOrderRoll= data => createAPI(`materialSplit/searchOrderRoll`,'POST',data)
+export const getCRollInfo= data => createAPI(`materialSplit/getCRollInfo`,'POST',data)
+export const rollOtherOutKu= data => createAPI(`materialSplit/rollOtherOutKu`,'POST',data)
 
+export const saveRollNoOut = data => createAPI(`materialSplit/saveRollNoOut`,'POST',data)
 
diff --git a/src/views/modules/purchasingManagement/BeginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/BeginMaterialSlittedSet.vue
deleted file mode 100644
index cb28020..0000000
--- a/src/views/modules/purchasingManagement/BeginMaterialSlittedSet.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
-  <el-dialog  v-drag
-              width="800px"
-              :title="title"
-              :close-on-click-modal="false"
-              :visible.sync="visible">
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: -10px;">
-      <el-form-item :label="'工厂编号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'关联单号1：'" >
-        <el-input v-model="dataForm.orderRef1" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'关联单号3：'" >
-        <el-input v-model="dataForm.orderRef3" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-        <el-button @click="getDataList()" type="primary" style="width: 80px;margin-left: 155px;">列表</el-button>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'供应商编号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'供应商名称：'" >
-        <el-input v-model="dataForm.site" style="width: 255px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-        <el-button @click="getDataList()" type="primary" style="width: 80px;margin-left: 155px;">创建</el-button>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'物料编码：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'物料名称：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'规格型号：'" >
-        <el-input v-model="dataForm.site" style="width: 180px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-        <el-button @click="getDataList()" type="primary" style="width: 80px;margin-left: 95px;">关闭</el-button>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'供应商编号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'送货单号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'订单数量：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-        <el-button @click="getDataList()" type="primary" style="margin-left: 142px;">供应商批号录入</el-button>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'每卷数量：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'卷数：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-        <el-button @click="getDataList()"  type="primary">插入</el-button>
-        <el-switch
-          v-model="value1"
-          active-color="#13ce66"
-          inactive-color="#ff4949"
-          active-value="Y"
-          inactive-value="N"
-          style="margin-left: 73px">
-        </el-switch>
-        <span>{{'自动打印标签'}}</span>
-      </el-form-item>
-      <el-form-item :label="'材料编码：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'客户编号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'产品编码：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'参照名称：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'供应商编码：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'供应商名称：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-    </el-form>
-    <el-tabs v-model="activeName" >
-      <el-tab-pane label="待分卷" name="first"><unslittedRoll></unslittedRoll></el-tab-pane>
-      <el-tab-pane label="已分卷" name="second"><slittedRoll></slittedRoll></el-tab-pane>
-      <el-tab-pane label="出库卷清单" :disabled="ableFlag" name="second"><slittedRoll></slittedRoll></el-tab-pane>
-    </el-tabs>
-    <el-footer  style="height:10px;margin-top: 0px;text-align:center"  >
-
-    </el-footer>
-  </el-dialog>
-
-</template>
-
-<script>
-
-  import unslittedRoll from "./createRoll/unslittedRoll"
-  import slittedRoll from "./createRoll/slittedRoll"
-  export default {
-    name: "BeginMaterialSlittedSet",
-    components: {unslittedRoll,slittedRoll},
-    data() {
-      return {
-        ableFlag:false,
-        height: '',
-        visible:false,
-        title:'创建卷',
-        dataForm:{
-          site:'',
-          orderRef1:'',
-          orderRef3:'',
-        },
-        value1:'N',
-        activeName:'first',
-      }
-    },
-    mounted() {
-    },
-    methods: {
-      init() {
-        this.visible = true
-      }
-    },
-    created() {
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
-
diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
new file mode 100644
index 0000000..0a7edaa
--- /dev/null
+++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
@@ -0,0 +1,961 @@
+<template>
+<div class="mod-config">
+  <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -10px;">
+    <el-form-item :label="'工厂编号：'">
+      <el-input v-model="dataForm.site" readonly style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'采购订单号：'">
+      <el-input v-model="dataForm.orderNo"  style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item style="margin-top: 30px">
+      <el-button @click="getDataList()" type="primary" style="width: 80px;margin-left: 290px;">列表</el-button>
+    </el-form-item>
+  </el-form>
+  <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+    <el-form-item :label="'供应商编号：'">
+      <el-input v-model="dataForm.supplierID" @change="getSupplier()" style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'供应商名称：'">
+      <el-input v-model="dataForm.supplierName" readonly style="width: 255px;"></el-input>
+    </el-form-item>
+    <el-form-item style="margin-top: 30px">
+      <el-button @click="saveCRoll()" type="primary" style="width: 80px;margin-left: 155px;">创建</el-button>
+    </el-form-item>
+  </el-form>
+  <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+    <el-form-item :label="'物料编码：'">
+      <el-input v-model="dataForm.partNo" @change="getPartNo2()" style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'物料名称：'">
+      <el-input v-model="dataForm.partDescription" readonly style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'规格型号：'">
+      <el-input v-model="dataForm.spec" readonly style="width: 180px;"></el-input>
+    </el-form-item>
+<!--    <el-form-item style="margin-top: 30px">-->
+<!--      <el-button @click="modelFlag=false" type="primary" style="width: 80px;margin-left: 95px;">关闭</el-button>-->
+<!--    </el-form-item>-->
+  </el-form>
+  <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+    <el-form-item :label="'接收日期：'">
+      <el-date-picker
+        style="width: 120px"
+        v-model="dataForm.receive"
+        value-format="yyyy-MM-dd"
+        placeholder="选择日期">
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item :label="'送货单号：'" style="">
+      <el-input v-model="dataForm.suppDeliveryNote" style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item style="margin-top: 30px;margin-left: 135px">
+      <el-button @click="getSaveModel()" type="primary" style="margin-left: 142px;">供应商批号录入</el-button>
+    </el-form-item>
+  </el-form>
+  <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+    <el-form-item :label="'每卷数量：'">
+      <el-input v-model="dataForm.rollQty" type="number" style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'卷数：'">
+      <el-input v-model="dataForm.rollNumber" type="number" style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item style="margin-top: 30px">
+      <el-button @click="insertData()" type="primary">插入</el-button>
+      <el-checkbox style="margin-left: 108px" v-model="dataForm.checked">自动打印标签</el-checkbox>
+    </el-form-item>
+  </el-form>
+  <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+    <el-form-item :label="'客户编号：'">
+      <el-input v-model="dataForm.customerID" @change="getCustomerID()" style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'产品编码：'">
+      <el-input v-model="dataForm.fGPartNo" @change="getPartNo()" style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'参照名称：'">
+      <el-input v-model="dataForm.referencePartDesc" readonly style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'供应商编码：'">
+      <el-input v-model="dataForm.supplierID" readonly style="width: 120px;"></el-input>
+    </el-form-item>
+    <el-form-item :label="'供应商名称：'">
+      <el-input v-model="dataForm.supplierName" readonly style="width: 120px;"></el-input>
+    </el-form-item>
+  </el-form>
+  <el-tabs v-model="activeName" style="font-size: 11px;width: 775px">
+    <el-tab-pane label="待分卷" name="first">
+      <div style="width: 800px;margin-top: 8px;">
+        <div style="width: 100%;float: left">
+          <el-table
+            height="200"
+            :data="dataList1"
+            border
+            :vertical-align="'middle'"
+            style="width: 100%;">
+            <el-table-column
+              v-for="(item,index) in columnList1" :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">
+                <span v-if="!item.columnHidden"> {{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>
+        </div>
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <span style="margin-left: 5px">合计：卷数</span>
+          <el-input v-model="sum1" style="width: 50px;" readonly></el-input>
+          <span>总数量</span>
+          <el-input v-model="sum2" style="width: 80px;" readonly></el-input>
+        </el-form>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane label="已分卷" name="second">
+      <div style="width: 760px;margin-top: 0px">
+        <el-table
+          height="200"
+          :data="dataList3"
+          border
+          :vertical-align="'middle'"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList3" :key="index"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :align="item.align"
+            :vertical-align="'middle'"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+          </el-table-column>
+        </el-table>
+        <el-form :inline="true" label-position="top" label-width="100px">
+          <div style="margin-top: 8px">
+            <span style="margin-left: 5px">合计：卷数</span>
+            <el-input v-model="sum3" style="width: 50px;" readonly></el-input>
+            <span>总卷数量</span>
+            <el-input v-model="sum4" style="width: 80px;" readonly></el-input>
+          </div>
+        </el-form>
+      </div>
+    </el-tab-pane>
+  </el-tabs>
+  <el-footer style="height:10px;margin-top: 0px;text-align:center">
+
+  </el-footer>
+  <el-dialog width="430px" :title="'供应商批号录入'" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-form-item :label="'工厂编码：'">
+        <el-input v-model="saveData.site" style="width: 80px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'卷号：'">
+        <el-input v-model="saveData.rollNo" style="width: 150px"></el-input>
+        <el-button @click="goSaveSuppRollNo()" type="primary" style="margin-left: 10px;">保存</el-button>
+        <el-button @click="modelFlag2=false" type="primary" style="margin-left: 10px;">关闭</el-button>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-form-item :label="'供应商批号：'">
+        <el-input v-model="saveData.suppRollNo" style="width: 369px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-footer style="height:10px;margin-top: 20px;text-align:center">
+    </el-footer>
+  </el-dialog>
+</div>
+</template>
+
+<script>
+  import {
+    getPartNoDetail,
+    checkCustomerID,
+    getSupplierDetail,
+  } from "@/api/base/site.js"
+  import {
+    searchSAPPurchaseOrder,
+    searchCRollInfoDetail,
+    saveCRollData,
+    saveSuppRollNo,
+    doSaveSuppRollNo,
+  } from "@/api/purchasingManagement/materialSplit.js"
+  export default {
+    name: "BeginMaterialSlittedSet",
+    data() {
+      return {
+        height: 200,
+        modelFlag: false,
+        modelFlag2: false,
+        modelInputFlag: true,
+        selectList: [],
+        activeName: 'first',
+        buttons: {
+          search: '查询',
+        },
+        saveData: {},
+        dataForm: {
+          site: this.$store.state.user.site,
+          orderNo: '',
+          orderItemNo: '',
+          supplierID: '',
+          supplierName: '',
+          partNo: '',
+          partDescription: '',
+          spec: '',
+          receive: new Date(),
+          suppDeliveryNote: '',
+          rollQty: '',
+          rollNumber: '',
+          customerID: '',
+          fGPartNo: '',
+          referencePartDesc: '',
+          checked: false,
+        },
+        sum1: '',
+        sum2: '',
+        sum3: '',
+        sum4: '',
+        dataList: [],
+        dataList3: [],
+        dataList1: [],
+        dataListLoading: false,
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableOrderNo',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "orderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "采购订单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableOrderDate',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "orderDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TablePlanReceiptDate',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "planReceiptDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "要求交货日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableSupplierID',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "supplierID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "供应商编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableStatus',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 70
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableSupplierName',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "supplierName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "供应商名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 300
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableOrderItemNo',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "orderItemNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 70
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TablePartNo',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "partNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TablePartDescription',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "partDescription",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 300
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableQuantity',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "quantity",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableCancelledFlag',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "cancelledFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "是否取消",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 70
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableSAPOrderNo',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "sAPOrderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "SAP订单标识号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034TableSite',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单表",
+            columnProp: "site",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工厂编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 70
+          }
+        ],
+        columnList1: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table1Number',
+            tableId: "6034Table1",
+            tableName: "查询SAP采购订单待分卷左表",
+            columnProp: "number",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "次序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table1RollQty',
+            tableId: "6034Table1",
+            tableName: "查询SAP采购订单待分卷左表",
+            columnProp: "rollQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "每卷数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table1RollNumber',
+            tableId: "6034Table1",
+            tableName: "查询SAP采购订单待分卷左表",
+            columnProp: "rollNumber",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "卷数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table1ALLRollQty',
+            tableId: "6034Table1",
+            tableName: "查询SAP采购订单待分卷左表",
+            columnProp: "allRollQty",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "总数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          }
+        ],
+        columnList3: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table3RollNo',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单已分卷表",
+            columnProp: "rollNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "卷号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table3RollQty',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单已分卷表",
+            columnProp: "rollQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "卷数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table3SuppDeliveryNote',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单已分卷表",
+            columnProp: "suppDeliveryNote",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "供应商送货单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table3RollDate',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单已分卷表",
+            columnProp: "rollDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "入库日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table3CreatedDate',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单已分卷表",
+            columnProp: "createdDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "分卷日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table3CreatedBy',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单已分卷表",
+            columnProp: "createdBy",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "分卷人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table3SuppRollNoFlag',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单已分卷表",
+            columnProp: "suppRollNoFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "已录入供应商批号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6034,
+            serialNumber: '6034Table3SuppRollNo',
+            tableId: "6034Table",
+            tableName: "查询SAP采购订单已分卷表",
+            columnProp: "suppRollNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "供应商批号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 300
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 200;
+      })
+    },
+    methods: {
+      insertData() {
+        if (this.dataForm.orderNo == '' || this.dataForm.orderNo == null) {
+          this.$alert("请输入采购订单号！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.dataForm.supplierID == '' || this.dataForm.supplierID == null) {
+          this.$alert("请输入供应商编号！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.dataForm.partNo == '' || this.dataForm.partNo == null) {
+          this.$alert("请输入材料编码！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.dataForm.suppDeliveryNote == '' || this.dataForm.suppDeliveryNote == null) {
+          this.$alert("请输入送货单号！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.dataForm.rollQty == '' || this.dataForm.rollQty == null || this.dataForm.rollQty <= 0) {
+          this.$alert("请输入正确的每卷数量！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.dataForm.rollNumber == '' || this.dataForm.rollQty == null || this.dataForm.rollNumber <= 0) {
+          this.$alert("请输入正确的卷数！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let newDate = {
+          number: this.dataList1.length + 1,
+          allRollQty: this.dataForm.rollQty * this.dataForm.rollNumber,
+          site: this.dataForm.site,
+          rollQty: this.dataForm.rollQty,
+          rollNumber: this.dataForm.rollNumber,
+          partNo: this.dataForm.partNo,
+          supplierID: this.dataForm.supplierID,
+          orderRef1: this.dataForm.orderNo,
+          orderRef2: this.dataForm.orderNo,
+          orderRef3: 0,
+          orderRef4: 'B',
+          suppDeliveryNote: this.dataForm.suppDeliveryNote,
+          rollDate: this.dataForm.receive,
+          createdBy: this.$store.state.user.name,
+          statusDb: 'I',
+          status: '已入库',
+          suppRollNoFlag: 'N',
+          sourceType: '期初入库',
+          rolltype: '合格卷',
+          rolltypeDb: 0,
+          parttypeFlag: 'R',
+          customerID: this.dataForm.customerID,
+          fGPartNo: this.dataForm.fGPartNo,
+        }
+        this.dataList1.push(newDate)
+        this.sum1 += newDate.rollNumber;
+        this.sum2 += newDate.allRollQty;
+      },
+      saveCRoll() {
+        if (this.dataList1.length == 0) {
+          this.$alert("没有待分卷信息！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+
+        this.doSaveCRoll()
+
+      },
+      doSaveCRoll() {
+        saveCRollData(this.dataList1).then(({data}) => {
+          if (data && data.code == 200) {
+            this.dataList1 = [];
+            this.sum1 = 0;
+            this.sum2 = 0;
+            let inData = {
+              site: this.dataForm.site,
+              orderRef1: this.dataForm.orderNo,
+              orderRef2: 0,
+            }
+            searchCRollInfoDetail(inData).then(({data}) => {
+              this.dataList3 = data.rows
+              for (let i = 0; i < data.total; i++) {
+                this.sum4 += this.dataList3[i].rollQty;
+              }
+              this.sum3 = data.total;
+            })
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+          this.dataForm={}
+          this.dataForm.site=this.$store.state.user.site
+          this.dataForm.receive=new Date();
+          this.dataForm=JSON.parse(JSON.stringify(this.dataForm))
+        })
+      },
+      getPartNo() {
+        let inData = {
+          site: this.dataForm.site,
+          partNo: this.dataForm.fGPartNo
+        }
+        getPartNoDetail(inData).then(({data}) => {
+          if (data.total > 0) {
+          } else {
+            this.dataForm.fGPartNo = '';
+            this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
+            this.$alert('该物料编码不存在', '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      getPartNo2() {
+        let inData = {
+          site: this.dataForm.site,
+          partNo: this.dataForm.partNo
+        }
+        getPartNoDetail(inData).then(({data}) => {
+          if (data.total > 0) {
+            this.dataForm.partDescription=data.rows[0].partDescription;
+            this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
+          } else {
+            this.dataForm.partNo = '';
+            this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
+            this.$alert('该物料编码不存在', '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      getCustomerID() {
+        let inData = {
+          site: this.dataForm.site,
+          configurationTemplateID: this.dataForm.customerID,
+        }
+        checkCustomerID(inData).then(({data}) => {
+          if (data.total > 0) {
+          } else {
+            this.dataForm.customerID = '';
+            this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
+            this.$alert('该客户编号不存在', '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      getSupplier(){
+        let inData={
+          site : this.dataForm.site,
+          supplierID : this.dataForm.supplierID
+        }
+        getSupplierDetail(inData).then(({data}) => {
+          let outList = data.rows
+          if (outList.length>0){
+            // this.modelData.supplierName=outList[0].supplierName;
+            this.$set(this.dataForm,'supplierName',outList[0].supplierName)
+          }else {
+            this.dataForm.supplierName='';
+            this.dataForm.supplierID='';
+            this.$alert('该供应商不存在', '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      //供应商批号录入
+      getSaveModel() {
+        this.saveData = {};
+        this.modelFlag2 = true;
+      },
+      goSaveSuppRollNo() {
+        if (this.saveData.site == '' || this.saveData.site == null) {
+          this.$alert("请输入工厂编码！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.saveData.rollNo == '' || this.saveData.rollNo == null) {
+          this.$alert("请输入卷号！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.saveData.suppRollNo == '' || this.saveData.suppRollNo == null) {
+          this.$alert("请输入供应商批号！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        saveSuppRollNo(this.saveData).then(({data}) => {
+            if (data.rows == null) {
+              this.$alert("该卷号不存在，请输入！", '错误', {
+                confirmButtonText: '确定'
+              })
+              return false;
+            } else {
+              if (data.rows.suppRollNoFlag == 'Y') {
+                this.$confirm(`该卷已经录入供应商批号,确认要重新录入吗？`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+
+                }).then(() => {
+                  doSaveSuppRollNo(this.saveData).then(({data}) => {
+                    if (data && data.code == 200) {
+                      this.modelFlag2 = false
+                      this.$message({
+                        message: '操作成功',
+                        type: 'success',
+                        duration: 1500,
+                        onClose: () => {
+                        }
+                      })
+                    } else {
+                      this.$alert(data.msg, '错误', {
+                        confirmButtonText: '确定'
+                      })
+                    }
+                  })
+                })
+              }else{
+                doSaveSuppRollNo(this.saveData).then(({data}) => {
+                  if (data && data.code == 200) {
+                    this.modelFlag2 = false
+                    this.$message({
+                      message: '操作成功',
+                      type: 'success',
+                      duration: 1500,
+                      onClose: () => {
+                      }
+                    })
+                  } else {
+                    this.$alert(data.msg, '错误', {
+                      confirmButtonText: '确定'
+                    })
+                  }
+                })
+              }
+            }
+          }
+        )
+      },
+
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
+
diff --git a/src/views/modules/purchasingManagement/createRoll/createRoll.vue b/src/views/modules/purchasingManagement/createRoll/createRoll.vue
deleted file mode 100644
index 12c4d87..0000000
--- a/src/views/modules/purchasingManagement/createRoll/createRoll.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <el-dialog  v-drag
-    width="800px"
-    :title="title"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: -10px;">
-      <el-form-item :label="'工厂编号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'关联单号1：'" >
-        <el-input v-model="dataForm.orderRef1" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'关联单号3：'" >
-        <el-input v-model="dataForm.orderRef3" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-      <el-button @click="getDataList()" type="primary" style="width: 80px;margin-left: 155px;">列表</el-button>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'供应商编号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'供应商名称：'" >
-        <el-input v-model="dataForm.site" style="width: 255px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-      <el-button @click="getDataList()" type="primary" style="width: 80px;margin-left: 155px;">创建</el-button>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'物料编码：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'物料名称：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'规格型号：'" >
-        <el-input v-model="dataForm.site" style="width: 180px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-      <el-button @click="getDataList()" type="primary" style="width: 80px;margin-left: 95px;">关闭</el-button>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'供应商编号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'送货单号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'订单数量：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-        <el-button @click="getDataList()" type="primary" style="margin-left: 142px;">供应商批号录入</el-button>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'每卷数量：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'卷数：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item style="margin-top: 30px">
-        <el-button @click="getDataList()"  type="primary">插入</el-button>
-        <el-switch
-          v-model="value1"
-          active-color="#13ce66"
-          inactive-color="#ff4949"
-          active-value="Y"
-          inactive-value="N"
-          style="margin-left: 73px">
-        </el-switch>
-        <span>{{'自动打印标签'}}</span>
-      </el-form-item>
-      <el-form-item :label="'材料编码：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="'客户编号：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'产品编码：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'参照名称：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'供应商编码：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'供应商名称：'" >
-        <el-input v-model="dataForm.site" style="width: 120px;" ></el-input>
-      </el-form-item>
-    </el-form>
-    <el-tabs v-model="activeName" >
-      <el-tab-pane label="待分卷" name="first"><unslittedRoll></unslittedRoll></el-tab-pane>
-      <el-tab-pane label="已分卷" name="second"><slittedRoll></slittedRoll></el-tab-pane>
-      <el-tab-pane label="出库卷清单" :disabled="ableFlag" name="second"><slittedRoll></slittedRoll></el-tab-pane>
-    </el-tabs>
-    <el-footer  style="height:10px;margin-top: 0px;text-align:center"  >
-
-    </el-footer>
-  </el-dialog>
-
-</template>
-
-<script>
-
-  import unslittedRoll from "./unslittedRoll"
-  import slittedRoll from "./slittedRoll"
-  export default {
-    name: "createRoll",
-    components: {unslittedRoll,slittedRoll},
-    data() {
-      return {
-        ableFlag:false,
-        height: '',
-        visible:false,
-        title:'创建卷',
-        dataForm:{
-          site:'',
-          orderRef1:'',
-          orderRef3:'',
-        },
-        value1:'N',
-        activeName:'first',
-      }
-    },
-    mounted() {
-    },
-    methods: {
-      init() {
-        this.visible = true
-      }
-    },
-    created() {
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/modules/purchasingManagement/createRoll/slittedRoll.vue b/src/views/modules/purchasingManagement/createRoll/slittedRoll.vue
deleted file mode 100644
index 1c33f82..0000000
--- a/src/views/modules/purchasingManagement/createRoll/slittedRoll.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <div class="mod-config" style="width: 760px">
-    <el-table
-      height="200"
-      :data="dataList"
-      border
-      :vertical-align="'middle'"
-      style="width: 100%;">
-      <el-table-column
-        v-for="(item,index) in columnList" :key="index"
-        :prop="item.columnProp"
-        :header-align="item.headerAlign"
-        :align="item.align"
-        :vertical-align="'middle'"
-        :min-width="item.width"
-        :label="item.columnLabel">
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-  import {} from "@/api/sysLanguage.js"
-
-  export default {
-    name: "slittedRoll",
-    data() {
-      return {
-        dataList:[],
-        columnList:[
-          {
-            columnProp:'site',
-            headerAlign:'center',
-            align:'left',
-            width:'80',
-            columnLabel:'卷号',
-          },
-          {
-            columnProp:'site',
-            headerAlign:'center',
-            align:'right',
-            width:'40',
-            columnLabel:'卷数量',
-          },
-          {
-            columnProp:'site',
-            headerAlign:'center',
-            align:'left',
-            width:'100',
-            columnLabel:'供应商送货单号',
-          },
-          {
-            columnProp:'site',
-            headerAlign:'center',
-            align:'left',
-            width:'60',
-            columnLabel:'入库日期',
-          },
-          {
-            columnProp:'site',
-            headerAlign:'center',
-            align:'left',
-            width:'60',
-            columnLabel:'分卷日期',
-          },
-          {
-            columnProp:'site',
-            headerAlign:'center',
-            align:'left',
-            width:'60',
-            columnLabel:'分卷人',
-          },
-          {
-            columnProp:'site',
-            headerAlign:'center',
-            align:'left',
-            width:'80',
-            columnLabel:'已录入供应商批号',
-          },
-          {
-            columnProp:'site',
-            headerAlign:'center',
-            align:'left',
-            width:'100',
-            columnLabel:'供应商批号',
-          },
-        ],
-      }
-    },
-    mounted() {
-
-    },
-    methods: {},
-    created() {
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/modules/purchasingManagement/createRoll/unslittedRoll.vue b/src/views/modules/purchasingManagement/createRoll/unslittedRoll.vue
deleted file mode 100644
index 03be804..0000000
--- a/src/views/modules/purchasingManagement/createRoll/unslittedRoll.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <div class="mod-config" style="width: 775px">
-    <div style="width: 40%;float: left">
-      <el-table
-        height="200"
-        :data="dataList1"
-        border
-        :vertical-align="'middle'"
-        style="width: 100%;">
-        <el-table-column
-          v-for="(item,index) in columnList1" :key="index"
-          :prop="item.columnProp"
-          :header-align="item.headerAlign"
-          :align="item.align"
-          :vertical-align="'middle'"
-          :min-width="item.width"
-          :label="item.columnLabel">
-        </el-table-column>
-      </el-table>
-    </div>
-    <div style="width: 58%;float: left">
-      <el-table
-        height="200"
-        :data="dataList2"
-        border
-        :vertical-align="'middle'"
-        style="width: 100%;">
-        <el-table-column
-          v-for="(item,index) in columnList2" :key="index"
-          :prop="item.columnProp"
-          :header-align="item.headerAlign"
-          :align="item.align"
-          :vertical-align="'middle'"
-          :min-width="item.width"
-          :label="item.columnLabel">
-        </el-table-column>
-      </el-table>
-    </div>
-  </div>
-</template>
-
-<script>
-    export default {
-      name: "unslittedRoll",
-      data() {
-        return {
-            dataList1:[],
-            dataList2:[],
-            columnList1:[
-              {
-                columnProp:'site',
-                headerAlign:'center',
-                align:'left',
-                width:'50',
-                columnLabel:'次序号',
-              },
-              {
-                columnProp:'site',
-                headerAlign:'center',
-                align:'right',
-                width:'80',
-                columnLabel:'每卷数量',
-              },
-              {
-                columnProp:'site',
-                headerAlign:'center',
-                align:'right',
-                width:'50',
-                columnLabel:'卷数',
-              },
-              {
-                columnProp:'site',
-                headerAlign:'center',
-                align:'right',
-                width:'80',
-                columnLabel:'总数量',
-              },
-            ],
-          columnList2:[
-            {
-              columnProp:'site',
-              headerAlign:'center',
-              align:'left',
-              width:'60',
-              columnLabel:'物料编码',
-            },
-            {
-              columnProp:'site',
-              headerAlign:'center',
-              align:'left',
-              width:'80',
-              columnLabel:'物料名称',
-            },
-            {
-              columnProp:'site',
-              headerAlign:'center',
-              align:'left',
-              width:'40',
-              columnLabel:'订单序号',
-            },
-            {
-              columnProp:'site',
-              headerAlign:'center',
-              align:'right',
-              width:'50',
-              columnLabel:'订单数量',
-            },
-          ],
-        }
-      },
-      mounted() {
-
-      },
-      methods: {},
-      created() {
-
-      }
-    }
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/modules/purchasingManagement/rollOtherOutKu.vue b/src/views/modules/purchasingManagement/rollOtherOutKu.vue
new file mode 100644
index 0000000..b7d509f
--- /dev/null
+++ b/src/views/modules/purchasingManagement/rollOtherOutKu.vue
@@ -0,0 +1,312 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+      <el-form-item :label="'出库日期：'">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.transDate"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="'经手人：'">
+        <el-input v-model="searchData.user" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工厂编号：'">
+        <el-input v-model="searchData.site" readonly style="width: 130px"></el-input>
+        <el-button @click="saveRollOtherOutKu()" style="margin-left: 30px" type="primary">最终出库</el-button>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+      <el-form-item :label="'备注：'">
+        <el-input v-model="searchData.remark" style="width: 420px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+      <el-form-item :label="'材料/成品卷号：'">
+        <el-input v-model="searchData.rollNo" @change="addList()" style="width: 270px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'类型：'">
+        <el-select filterable v-model="searchData.type" style="width: 130px">
+          <el-option label="材料报废" value="材料报废"></el-option>
+          <el-option label="供应商退货" value="供应商退货"></el-option>
+          <el-option label="其他" value="其他"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :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">
+          <span v-if="!item.columnHidden"> {{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>
+    <span style="margin-left: 5px">合计：卷数量</span>
+    <el-input v-model="sum1" style="width: 80px;" readonly></el-input>
+    <span>总卷数</span>
+    <el-input v-model="sum2" style="width: 50px;" readonly></el-input>
+  </div>
+</template>
+
+<script>
+  import {
+    getCRollInfo,
+    rollOtherOutKu,
+  } from "@/api/purchasingManagement/materialSplit.js"
+
+  export default {
+    //查询-订单卷信息
+    name: "searchOrderRoll",
+    data() {
+      return {
+        height: 200,
+        modelInputFlag:true,
+        selectList:[],
+        searchData: {
+          transDate:new Date(),
+          site:this.$store.state.user.site,
+          rollNo:'',
+          type:'',
+          user:this.$store.state.user.name
+        },
+        sum1: 0,
+        sum2: 0,
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6036,
+            serialNumber: '6036TableRollNo',
+            tableId: "6036Table",
+            tableName: "卷其他出库登记表",
+            columnProp: "rollNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "卷号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6036,
+            serialNumber: '6036TableRollQty',
+            tableId: "6036Table",
+            tableName: "卷其他出库登记表",
+            columnProp: "rollQty",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "卷数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6036,
+            serialNumber: '6036TablePartNo',
+            tableId: "6036Table",
+            tableName: "卷其他出库登记表",
+            columnProp: "partNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6036,
+            serialNumber: '6036TableSpec',
+            tableId: "6036Table",
+            tableName: "卷其他出库登记表",
+            columnProp: "spec",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料名称/规格型号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 300
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6036,
+            serialNumber: '6036TableNumber',
+            tableId: "6036Table",
+            tableName: "卷其他出库登记表",
+            columnProp: "number",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "卷数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6036,
+            serialNumber: '6036TableWarehouseid',
+            tableId: "6036Table",
+            tableName: "卷其他出库登记表",
+            columnProp: "warehouseid",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "仓库",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 290;
+      })
+    },
+    methods: {
+      addList(){
+        if(this.dataList.length>0){
+          for (let i = 0; i < this.dataList.length; i++) {
+            if(this.dataList[i].rollNo==this.searchData.rollNo){
+              this.$alert("卷号已存在于列表中，请确认！", '错误', {
+                confirmButtonText: '确定'
+              })
+              this.searchData.rollNo='';
+              return false;
+            }
+          }
+        }
+        if(this.searchData.rollNo!=''&&this.searchData.rollNo!=null){
+          let inData={
+            site:this.searchData.site,
+            rollNo:this.searchData.rollNo
+          }
+          getCRollInfo(inData).then(({data}) => {
+            if(data.row==null){
+              this.$alert("卷号不存在", '错误', {
+                confirmButtonText: '确定'
+              })
+              this.searchData.rollNo='';
+              return false;
+            }
+              if(data.row.status!='已入库'){
+                this.$alert("该卷号不在库内！", '错误', {
+                  confirmButtonText: '确定'
+                })
+                this.searchData.rollNo='';
+                return false;
+              }
+            if(this.dataList.length>0){
+             if(this.dataList[0].warehouseid!=data.row.warehouseid){
+               this.$alert("该卷号与列表中其他卷不在一个仓库！", '错误', {
+                 confirmButtonText: '确定'
+               })
+               this.searchData.rollNo='';
+               return false;
+             }
+            }
+              this.dataList.push(data.row)
+            this.dataList=JSON.parse(JSON.stringify(this.dataList))
+            console.log(this.dataList)
+              this.sum1+=data.row.rollQty;
+              this.sum2+=1;
+          })
+        }
+      },
+      saveRollOtherOutKu() {
+        if (this.searchData.transDate == '' || this.searchData.transDate == null) {
+          this.$alert("请选择出库日期！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.searchData.user == '' || this.searchData.user == null) {
+          this.$alert("请选择经手人！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.searchData.type == '' || this.searchData.type == null) {
+          this.$alert("请选择出库原因！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let inData = {
+          transDate: this.searchData.transDate,
+          userId: this.searchData.user,
+          site: this.searchData.site,
+          remark: this.searchData.remark,
+          orderRef3: this.searchData.type,
+          saveList: this.dataList
+        }
+        rollOtherOutKu(inData).then(({data}) => {
+          if (data && data.code == 200) {
+            this.dataList=[];
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          }else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/purchasingManagement/searchOrderRoll.vue b/src/views/modules/purchasingManagement/searchOrderRoll.vue
new file mode 100644
index 0000000..8f4be04
--- /dev/null
+++ b/src/views/modules/purchasingManagement/searchOrderRoll.vue
@@ -0,0 +1,701 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+      <el-form-item :label="'工厂编号：'">
+        <el-input v-model="searchData.site" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'订单号：'">
+        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'类型：'">
+        <el-select filterable v-model="searchData.type" style="width: 130px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="采购订单" value="采购入库"></el-option>
+          <el-option label="分卷订单" value="分切入库"></el-option>
+          <el-option label="期初入库" value="期初入库"></el-option>
+        </el-select>
+        <el-button @click="getData()" type="primary">查询</el-button>
+        <el-button @click="getSaveModel()" type="primary" style="margin-left: 142px;">供应商批号录入</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="300"
+      :data="dataList"
+      border
+      @row-click="changeData"
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :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">
+          <span v-if="!item.columnHidden"> {{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>
+    <el-table
+      :height="height"
+      :data="dataList2"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList2" :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">
+          <span v-if="!item.columnHidden"> {{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>
+    <el-dialog width="430px" :title="'供应商批号录入'" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2">
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+        <el-form-item :label="'工厂编码：'">
+          <el-input v-model="saveData.site" style="width: 80px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'卷号：'">
+          <el-input v-model="saveData.rollNo" style="width: 150px"></el-input>
+          <el-button @click="goSaveSuppRollNo()" type="primary" style="margin-left: 10px;">保存</el-button>
+          <el-button @click="modelFlag2=false" type="primary" style="margin-left: 10px;">关闭</el-button>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+        <el-form-item :label="'供应商批号：'">
+          <el-input v-model="saveData.suppRollNo" style="width: 369px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:10px;margin-top: 20px;text-align:center">
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    searchOrderRoll,
+    searchCRollInfoDetail,
+    saveSuppRollNo,
+    doSaveSuppRollNo,
+  } from "@/api/purchasingManagement/materialSplit.js"
+
+  export default {
+    //查询-订单卷信息
+    name: "searchOrderRoll",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelFlag2: false,
+        modelInputFlag:true,
+        selectList:[],
+        searchData: {
+          site:'',
+          orderNo:'',
+          type:'',
+          user:this.$store.state.user.name
+        },
+        dataList:[],
+        dataList2:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        saveData: {
+          site:'',
+          rollNo:'',
+          suppRollNo:'',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableOrderNo',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "orderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableOrderDate',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "orderDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TablePlanReceiptDate',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "planReceiptDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "要求交货日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableSupplierID',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "supplierID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "供应商编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableStatus',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableSupplierName',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "supplierName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "供应商名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 180
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableOrderItemNo',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "orderItemNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TablePartNo',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "partNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TablePartDescription',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "partDescription",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableQuantity',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "quantity",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableCancelledFlag',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "cancelledFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "是否取消",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableSAPOrderNo',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "sAPOrderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "SAP订单识别号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableSite',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "site",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工厂编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableCreatedDate',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "createdDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "分卷日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 180
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableCreatedBy',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "createdBy",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "分卷人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035TableType',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息主表",
+            columnProp: "type",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          }
+        ],
+        columnList2: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2RollNo',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "rollNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "卷号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2RollQty',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "rollQty",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "卷数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2SuppDeliveryNote',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "suppDeliveryNote",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "供应商送货单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2RollDate',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "rollDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "入库日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2CreatedDate',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "createdDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "分卷日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2CreatedBy',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "createdBy",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "分卷人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2Status',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "卷状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2SuppRollNoFlag',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "suppRollNoFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "已录入供应商批号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6035,
+            serialNumber: '6035Table2SuppRollNo',
+            tableId: "6035Table",
+            tableName: "查询订单卷信息明细表",
+            columnProp: "suppRollNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "供应商批号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 300
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 500;
+      })
+    },
+    methods: {
+      getData(){
+        searchOrderRoll(this.searchData).then(({data}) => {
+          this.dataList = data.rows
+          let inData={
+            site: data.rows[0].site,
+            orderRef1: data.rows[0].orderNo,
+            orderRef3: data.rows[0].orderItemNo,
+          }
+          searchCRollInfoDetail(inData).then(({data}) => {
+            this.dataList2 = data.rows
+
+          })
+        })
+      },
+      //单击切换订单
+      changeData(row) {
+        let inData={
+          site:row.site,
+          orderRef1:row.orderNo,
+          orderRef3:row.orderItemNo,
+        }
+        searchCRollInfoDetail(inData).then(({data}) => {
+          this.dataList2 = data.rows
+
+        })
+      },
+      //供应商批号录入
+      getSaveModel() {
+        this.saveData = {};
+        this.modelFlag2 = true;
+      },
+      goSaveSuppRollNo() {
+        if (this.saveData.site == '' || this.saveData.site == null) {
+          this.$alert("请输入工厂编码！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.saveData.rollNo == '' || this.saveData.rollNo == null) {
+          this.$alert("请输入卷号！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.saveData.suppRollNo == '' || this.saveData.suppRollNo == null) {
+          this.$alert("请输入供应商批号！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        saveSuppRollNo(this.saveData).then(({data}) => {
+            if (data.rows == null) {
+              this.$alert("该卷号不存在，请输入！", '错误', {
+                confirmButtonText: '确定'
+              })
+              return false;
+            } else {
+              if (data.rows.suppRollNoFlag == 'Y') {
+                this.$confirm(`该卷已经录入供应商批号,确认要重新录入吗？`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+
+                }).then(() => {
+                  doSaveSuppRollNo(this.saveData).then(({data}) => {
+                    if (data && data.code == 200) {
+                      this.modelFlag2 = false
+                      this.$message({
+                        message: '操作成功',
+                        type: 'success',
+                        duration: 1500,
+                        onClose: () => {
+                        }
+                      })
+                    } else {
+                      this.$alert(data.msg, '错误', {
+                        confirmButtonText: '确定'
+                      })
+                    }
+                  })
+                })
+              }else{
+                doSaveSuppRollNo(this.saveData).then(({data}) => {
+                  if (data && data.code == 200) {
+                    this.modelFlag2 = false
+                    this.$message({
+                      message: '操作成功',
+                      type: 'success',
+                      duration: 1500,
+                      onClose: () => {
+                      }
+                    })
+                  } else {
+                    this.$alert(data.msg, '错误', {
+                      confirmButtonText: '确定'
+                    })
+                  }
+                })
+              }
+            }
+          }
+        )
+      },
+    },
+    created() {
+
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
diff --git a/src/views/modules/purchasingManagement/searchRollInformation.vue b/src/views/modules/purchasingManagement/searchRollInformation.vue
index 4e26c9e..9ceda9e 100644
--- a/src/views/modules/purchasingManagement/searchRollInformation.vue
+++ b/src/views/modules/purchasingManagement/searchRollInformation.vue
@@ -129,7 +129,7 @@
 
   export default {
     //查询-卷信息
-    name: "searchRollInformation.vue",
+    name: "searchRollInformation",
     data() {
       return {
         height: 200,
diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
index 1b21410..12e782a 100644
--- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
+++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
@@ -297,7 +297,11 @@
           slittedFlag: 'Y',
           user: this.$store.state.user.name
         },
-        saveData: {},
+        saveData: {
+          site:'',
+          rollNo:'',
+          suppRollNo:'',
+        },
         dataForm: {
           site: '',
           orderNo: '',
diff --git a/src/views/modules/purchasingManagement/searchSAPSlittedOrder.vue b/src/views/modules/purchasingManagement/searchSAPSlittedOrder.vue
index bfce324..dc4eb37 100644
--- a/src/views/modules/purchasingManagement/searchSAPSlittedOrder.vue
+++ b/src/views/modules/purchasingManagement/searchSAPSlittedOrder.vue
@@ -1,4 +1,4 @@
-<script src="../../../api/purchasingManagement/materialSplit.js"></script>
+
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
@@ -233,12 +233,12 @@
           <div style="margin-top: 0px;">
             <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
               <span> {{"卷号"}}:</span>
-              <el-input v-model="dataForm2.rollNo" style="width: 120px;"></el-input>
+              <el-input v-model="dataForm2.rollNo" @change="rollNoOut()" style="width: 120px;"></el-input>
               <span>{{"(回车插入记录) 当前卷号："}}:</span>
               <el-input v-model="dataForm2.rollNo2" disabled style="width: 120px;"></el-input>
               <span style="margin-left: 20px"> {{"退料数量"}}:</span>
               <el-input v-model="dataForm2.fTotalQty2" style="width: 100px;"></el-input>
-              <el-button @click="finishRoll()"  style="margin-left: 10px;margin-top: 0px">{{'结束卷'}}
+              <el-button @click="checkRoll()"  style="margin-left: 10px;margin-top: 0px">{{'结束卷'}}
               </el-button>
             </el-form>
             <el-table
@@ -294,7 +294,12 @@
 </template>
 
 <script>
+  import {
+
+    getPartNoDetail,
+    checkCustomerID
 
+  } from "@/api/base/site.js"
   import {
     searchSAPSlittedOrder,
     searchCRollInfoDetail,
@@ -303,6 +308,8 @@
     doSaveSuppRollNo,
     getTransRoll,
     saveFinishRoll,
+    checkFinishRoll,
+    saveRollNoOut
   } from "@/api/purchasingManagement/materialSplit.js"
 
   export default {
@@ -1033,6 +1040,7 @@
         })
       },
       showModel(row) {
+        this.dataForm2={};
         this.dataList1 = [];
         this.sum1 = 0;
         this.sum2 = 0;
@@ -1067,13 +1075,7 @@
         this.getTransRoll();
         this.modelFlag = true;
       },
-      insertData() {
-        // if (this.dataForm.suppDeliveryNote == '' || this.dataForm.suppDeliveryNote == null) {
-        //   this.$alert("请输入送货单号！", '错误', {
-        //     confirmButtonText: '确定'
-        //   })
-        //   return false;
-        // }
+      insertData(){
         if (this.dataForm.rollQty == '' || this.dataForm.rollQty == null || this.dataForm.rollQty <= 0) {
           this.$alert("请输入正确的每卷数量！", '错误', {
             confirmButtonText: '确定'
@@ -1086,6 +1088,21 @@
           })
           return false;
         }
+        if(this.dataList3.length>0){
+          this.$confirm(`该订单已有分切卷，是否继续?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.insertData2();
+          })
+        }else {
+          this.insertData2();
+        }
+      },
+      insertData2() {
+
+
         let newDate = {
           number: this.dataList1.length + 1,
           allRollQty: this.dataForm.rollQty * this.dataForm.rollNumber,
@@ -1097,14 +1114,14 @@
           orderRef1: this.dataForm.orderNo,
           orderRef2: this.dataForm.orderNo,
           orderRef3: this.dataForm.orderItemNo,
-          orderRef4: 'P',
+          orderRef4: 'S',
           // suppDeliveryNote: this.dataForm.suppDeliveryNote,
           rollDate: this.dataForm.receive,
           createdBy: this.$store.state.user.name,
-          statusDb: 'N',
-          status: '未入库',
+          statusDb: 'I',
+          status: '已入库',
           suppRollNoFlag: 'N',
-          sourceType: '采购入库',
+          sourceType: '分切入库',
           rolltype: '合格卷',
           rolltypeDb: 0,
           parttypeFlag: 'R',
@@ -1118,6 +1135,12 @@
         this.sum2 += newDate.allRollQty;
       },
       saveCRoll() {
+        if(this.dataForm2.rollNo2==""||this.dataForm2.rollNo2==null){
+          this.$alert("该订单下，该用户下没有扫描出库卷，不能分切  ！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
         if (this.dataList1.length == 0) {
           this.$alert("没有待分卷信息！", '错误', {
             confirmButtonText: '确定'
@@ -1349,21 +1372,33 @@
       getTransRoll() {
         let inData = {
           site: this.dataForm.site,
-          orderRef1: this.dataForm.orderRef1,
+          orderRef1: this.dataForm.orderNo,
           partNo: this.dataForm.sOPartNo,
+          user:this.$store.state.user.name,
         }
+
         getTransRoll(inData).then(({data}) => {
           this.dataList4 = data.rows
+          if(data.row2!=null) {
+            this.dataForm2.rollNo2 = data.row2.rollNo
+          }
         })
       },
-      finishRoll() {
+      //结束卷
+      checkRoll() {
         if (this.dataList1.length > 0) {
           this.$alert("该界面存在分卷尚未创建，请先创建！！", '错误', {
             confirmButtonText: '确定'
           })
           return false;
         }
-        if (this.dataList1.fTotalQty2 <= 0) {
+        if(this.dataForm2.rollNo2 ==""||this.dataForm2.rollNo2 ==null){
+          this.$alert("请选择卷号！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.dataForm2.fTotalQty2 <= 0 || this.dataForm2.fTotalQty2 ==""||this.dataForm2.fTotalQty2 ==null) {
           this.$alert("请输入正确的每卷数量！", '错误', {
             confirmButtonText: '确定'
           })
@@ -1371,15 +1406,110 @@
         }
         let inData = {
           site: this.dataForm.site,
-          orderRef1: this.dataForm.orderRef1,
-          orderRef3: this.dataForm.orderRef3,
-          rollNo:this.dataForm2.rollNo,
+          orderRef1: this.dataForm.orderNo,
+          orderRef3: this.dataForm.orderItemNo,
+          rollNo:this.dataForm2.rollNo2,
+          fTotalQty2:this.dataForm2.fTotalQty2,
+          sOPartNo:this.dataForm.sOPartNo,
+          userId:this.$store.state.user.name,
+        }
+        checkFinishRoll(inData).then(({data}) => {
+          if (data && data.code == 200) {
+            console.log(data.obj)
+            if(data.obj.successFlag=='Y'){
+              this.saveRoll();
+            }else {
+              if(data.obj.ableFlag=='Y'){
+                this.$confirm(data.obj.messageBox+`,是否继续`, '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+
+                }).then(() => {
+                    this.saveRoll();
+                })
+              }else {
+                this.$alert(data.obj.messageBox, '错误', {
+                  confirmButtonText: '确定'
+                })
+                return false;
+              }
+            }
+
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      saveRoll(){
+        let inData = {
+          site: this.dataForm.site,
+          orderRef1: this.dataForm.orderNo,
+          orderRef3: this.dataForm.orderItemNo,
+          rollNo:this.dataForm2.rollNo2,
           fTotalQty2:this.dataForm2.fTotalQty2,
           sOPartNo:this.dataForm.sOPartNo,
           userId:this.$store.state.user.name,
         }
         saveFinishRoll(inData).then(({data}) => {
           if (data && data.code == 200) {
+            let newData={
+              transNo:data.obj.transNo,
+              transDate:data.obj.transDate,
+              subNo:this.dataForm2.rollNo2,
+              subQty:this.dataForm2.fTotalQty2,
+              transTypeDb:"SIR",
+              userName:this.$store.state.user.name,
+              partNo:this.dataForm.sOPartNo,
+            }
+            this.dataList4.push(newData);
+            this.dataForm2={};
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      rollNoOut(){
+        if (this.dataForm2.rollNo == '' || this.dataForm2.rollNo == null) {
+          this.$alert("卷号不能为空，请输入!", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let inData={
+          site:this.dataForm.site,
+          partNo:this.dataForm.partNo,
+          fGPartNo:this.dataForm.sOPartNo,
+          rollNo:this.dataForm2.rollNo,
+          orderRef1:this.dataForm.orderNo,
+          orderRef3:this.dataForm.orderItemNo,
+          user:this.$store.state.user.name,
+        }
+        saveRollNoOut(inData).then(({data}) => {
+          if (data && data.code == 200) {
+            let newData={
+              transNo:data.obj.transNo,
+              transDate:data.obj.transDate,
+              subNo:this.dataForm2.rollNo,
+              subQty:data.obj.qty,
+              transTypeDb:"SI",
+              userName:this.$store.state.user.name,
+              partNo:this.dataForm.sOPartNo,
+            }
+            this.dataList4.push(newData);
+            this.dataForm2.rollNo2=this.dataForm2.rollNo;
+            this.dataForm2.rollNo='';
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1388,6 +1518,7 @@
               }
             })
           } else {
+            this.dataForm2.rollNo='';
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })