diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
index 60b5a20..db5f0eb 100644
--- a/src/components/Crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -2,7 +2,7 @@
   <div class="crud-opts">
     <span class="crud-opts-left">
       <!--左侧插槽-->
-      <slot name="left" />
+      <slot name="left"/>
       <el-button
         v-if="crud.optShow.add"
         v-permission="permission.add"
@@ -51,7 +51,7 @@
         @click="crud.doExport"
       >导出</el-button>
       <!--右侧-->
-      <slot name="right" />
+      <slot name="right"/>
     </span>
     <el-button-group class="crud-opts-right">
       <el-button
@@ -106,7 +106,7 @@
   </div>
 </template>
 <script>
-import CRUD, { crud } from '@crud/crud'
+import CRUD, {crud} from '@crud/crud'
 import crudTableConfig from '@/api/tableConfig'
 import Sortable from 'sortablejs'
 
@@ -130,22 +130,28 @@ export default {
   props: {
     permission: {
       type: Object,
-      default: () => { return {} }
+      default: () => {
+        return {}
+      }
     },
     ignoreColumns: {
       type: Array,
-      default: () => { return [] }
+      default: () => {
+        return []
+      }
     },
     tableKey: {
       type: String,
-      default: () => { return '' }
+      default: () => {
+        return ''
+      }
     }
   },
   data() {
     return {
-      hiddenColumns:[],
-      table_configs:[],
-      table_configs_xs:[],
+      hiddenColumns: [],
+      table_configs: [],
+      table_configs_xs: [],
       tableColumns: [],
       allColumnsSelected: true,
       allColumnsSelectedIndeterminate: false,
@@ -183,51 +189,57 @@ export default {
 
     initcolumn() {
       this.updateTableColumns()
-      const strHidden=sessionStorage.getItem(this.tableKey)
-      this.hiddenColumns= JSON.parse(strHidden);
-      if(this.hiddenColumns.length>0){
-        console.log("------移除---------------")
+      const strHidden = sessionStorage.getItem(this.tableKey)
+      this.hiddenColumns = JSON.parse(strHidden);
+      if (this.hiddenColumns) {
         const table = this.crud.props.table
-        this.table_configs_xs.forEach((column,index) => {
-          const vm = table.$children.find(e => e.label === column.label)
-
-          const columnConfig = vm.columnConfig
-
-
-          console.log(columnConfig)
-          vm.owner.store.commit('removeColumn', columnConfig, null)
-
-        })
+        if (table) {  // 添加检查
+          this.table_configs_xs.forEach((column, index) => {
+            const vm = table.$children.find(e => e.label === column.label)
+            if (vm) {  // 再次检查
+              const columnConfig = vm.columnConfig
+              vm.owner.store.commit('removeColumn', columnConfig, null)
+            }
+          })
+        }
         this.ignoreNextTableColumnsChange = false
-        console.log("--------移除完成-------------")
         setTimeout(() => {
           // 方法区
           this.showcolumn();
         }, 200)
       }
-
-      //vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex + 1 , null)
-
-
     },
     showcolumn() {
-      console.log("------显示列------")
-      const strHidden=sessionStorage.getItem(this.tableKey)
-      this.hiddenColumns= JSON.parse(strHidden);
-      const table = this.crud.props.table
-      this.hiddenColumns.forEach((column,index) => {
-
-        const vm = table.$children.find(e => e.prop === column.property)
-        const columnConfig = vm.columnConfig
-        console.log(columnConfig.label)
-        if(column.visible){
-          columnConfig.width=column.width
-          columnConfig.visible=column.visible
-          vm.owner.store.commit('insertColumn', columnConfig, index+1  , null)
+      try {
+        // 从sessionStorage安全地获取并解析hiddenColumns
+        const strHidden = sessionStorage.getItem(this.tableKey)
+        if (strHidden) {
+          this.hiddenColumns = JSON.parse(strHidden);
+        } else {
+          // 如果没有找到相应的存储信息，可以初始化为空数组或相应的默认值
+          this.hiddenColumns = [];
         }
-      })
-      console.log("------显示列完成------")
-      this. updateTableColumns();
+
+        const table = this.crud.props.table
+        // 优化循环中的条件判断和错误处理
+        this.hiddenColumns.forEach((column, index) => {
+          const vm = table.$children.find(e => e && e.prop === column.property)
+          if (vm) {
+            const columnConfig = vm.columnConfig;
+            // 确保columnConfig存在
+            if (columnConfig) {
+              if (column.visible) {
+                // 仅当列需要显示时，才更新其配置
+                columnConfig.width = column.width;
+                columnConfig.visible = column.visible;
+                vm.owner.store.commit('insertColumn', columnConfig, index + 1, null);
+              }
+            }
+          }
+        });
+        this.updateTableColumns();
+      } catch (error) {
+      }
     },
     //列拖拽
     columnDrop() {
@@ -237,51 +249,51 @@ export default {
         delay: 0,
         onEnd: evt => {
           // 根据中文label进行拖拉
-          this.ColumnsDrop(evt.item.innerText,evt.newIndex)
+          this.ColumnsDrop(evt.item.innerText, evt.newIndex)
         }
       })
     },
 
     //新加方法
-    ColumnsDrop(oldText,newIndex) {
+    ColumnsDrop(oldText, newIndex) {
       const table = this.crud.props.table
       let myindex = -1 //空格
       let oldIndex1 = 0
-      let  step = -1
+      let step = -1
       let count = 0
       //
-      this.tableColumns.some((column,index) => {
-        if(column.visible) {
+      this.tableColumns.some((column, index) => {
+        if (column.visible) {
           count++
         }
       })
       // 定位拖拉中文表头位置以及在该字段之前隐藏字段数量
-      this.tableColumns.some((column,index) => {
-        if(column.label === oldText) {
+      this.tableColumns.some((column, index) => {
+        if (column.label === oldText) {
           oldIndex1 = index
           return true
-        }else{
+        } else {
           // 空格在字段前面
-          if(step>index){
+          if (step > index) {
             myindex++
           }
         }
         step++
       })
-      if (myindex === -1  ) {
+      if (myindex === -1) {
         myindex = 0
       }
-      let item= this.tableColumns[oldIndex1]
+      let item = this.tableColumns[oldIndex1]
       const vm = table.$children.find(e => e.prop === item.property)
       const columnConfig = vm.columnConfig
       /*this.tableColumns.splice(oldIndex1-1, 1)
       this.tableColumns.splice(myindex-1, 0, item)*/
-      if(oldIndex1 <newIndex){ // 从左至右拖动
-        vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex  , null)
+      if (oldIndex1 < newIndex) { // 从左至右拖动
+        vm.owner.store.commit('insertColumn', columnConfig, newIndex + myindex, null)
         vm.owner.store.commit('removeColumn', columnConfig, null)
-      }else { //从右至左拖动
+      } else { //从右至左拖动
         vm.owner.store.commit('removeColumn', columnConfig, null)
-        vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex  , null)
+        vm.owner.store.commit('insertColumn', columnConfig, newIndex + myindex, null)
       }
       // 列重新排序
       this.ignoreNextTableColumnsChange = false
@@ -352,7 +364,7 @@ export default {
       })
       if (selectedCount === 0) {
         this.crud.notify('请至少选择一列', CRUD.NOTIFICATION_TYPE.WARNING)
-        this.$nextTick(function() {
+        this.$nextTick(function () {
           item.visible = true
         })
         return
@@ -375,8 +387,8 @@ export default {
       crudTableConfig.add(post_table_config)*/
       //this.postToTableConfig();
     },
-    postToTableConfig(){
-      this. updateTableColumns();
+    postToTableConfig() {
+      this.updateTableColumns();
       const columns = []
       this.tableColumns.forEach(column => {
         const table_config = {
@@ -392,11 +404,11 @@ export default {
         tableType: this.tableKey
       }
 
-      this.crud.loading=true
+      this.crud.loading = true
       crudTableConfig.add(post_table_config).then(res => {
         setTimeout(() => {
           // 方法区
-          this.crud.loading=false
+          this.crud.loading = false
         }, 500)
 
       })
@@ -411,7 +423,7 @@ export default {
       if (item.visible) {
         // 找出合适的插入点
         const columnIndex = this.tableColumns.indexOf(item)
-        vm.owner.store.commit('insertColumn', columnConfig, columnIndex+1, null)
+        vm.owner.store.commit('insertColumn', columnConfig, columnIndex + 1, null)
       } else {
         vm.owner.store.commit('removeColumn', columnConfig, null)
       }
@@ -431,9 +443,11 @@ export default {
   display: flex;
   align-items: center;
 }
+
 .crud-opts .crud-opts-right {
   margin-left: auto;
 }
+
 .crud-opts .crud-opts-right span {
   float: left;
 }
diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index 1b0cbac..0f9a7f5 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -147,7 +147,6 @@ function CRUD(options) {
           }
           crud.page.total = data.totalElements
           crud.data = data.content
-          crud.tableHeight = window.innerHeight -table.$el.offsetTop - 60;
           crud.resetDataStatus()
           // time 毫秒后显示表格
           setTimeout(() => {
diff --git a/src/views/business-asn/asn/index.vue b/src/views/business-asn/asn/index.vue
index d953b36..9deb83c 100644
--- a/src/views/business-asn/asn/index.vue
+++ b/src/views/business-asn/asn/index.vue
@@ -110,6 +110,8 @@
 <!--          明细-->
 <!--        </el-button>-->
       </crudOperation>
+
+
       <!--自己定义新增表单组件-->
       <el-dialog :visible.sync="inserAsnOnOff" :title="(this.updateAsnOnOff ? '修改 ':'新增 ')+'收货管理'" width="900px"
       >
@@ -214,6 +216,7 @@
           <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
+
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler" :height="crud.tableHeight" @select="invVerifySTFM" @select-all="invVerifySTFAll" border
@@ -271,6 +274,8 @@
           </template>
         </el-table-column>
       </el-table>
+      <viewAsnDetail ref="viewAsnDetail" />
+
       <!--分页组件-->
       <div style="float: right;">
         <pagination/>
@@ -294,6 +299,7 @@ import { queryPointList } from '@/api/point'
 import { queryItemAll } from '@/api/item'
 import { formatDate } from '@/utils/commonUtils'
 import {xbjsOut} from "@/api/pickOut";
+import viewAsnDetail from "@/views/business-asn/asn/viewAsnDetail.vue"
 
 const defaultForm = {
   id: null,
@@ -325,7 +331,7 @@ const defaultForm = {
 }
 export default {
   name: 'Asn',
-  components: { pagination, crudOperation, rrOperation, udOperation,DateRangePicker },
+  components: { pagination, crudOperation, rrOperation, udOperation,DateRangePicker,viewAsnDetail },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['asn_status'],
   cruds() {
@@ -481,24 +487,9 @@ export default {
       })
     },
     //新政的开关
-    inserAsnOnOffM(data) {
-      this.$router.push({path:'/business-asn/viewAsnDetail'})
-      // this.inserAsnOnOff = true
-      // let no = null
-      // for (const billTypDateElement of this.billTypeOptions) {
-      //   if (billTypDateElement.code === data) {
-      //     this.asnFrom.billType = billTypDateElement
-      //     no = billTypDateElement.code
-      //   }
-      // }
-      // if (this.asnFrom.billType === null) {
-      //   this.$message.error('billType 没有加载 或没有ZC_CK数据')
-      //   return
-      // }
-      // getCodeNo(no).then(res => {
-      //   this.asnFrom.code = res
-      // })
-      // this.asnFrom.orderDate = this.getNewDate()
+    inserAsnOnOffM() {
+      this.$refs.viewAsnDetail.dialogInsertAsn=true
+      //this.$router.push({path:'/business-asn/viewAsnDetail'})
     },
     //获取当前时间
     getNewDate() {
@@ -544,7 +535,10 @@ export default {
       })
     },
     asnDetailRouter(datas){
-      this.$router.push({path:'/business-asn/viewAsnDetail',query: {ids:datas.id}})
+      this.$refs.viewAsnDetail.dialogInsertAsn=true
+      this.$refs.viewAsnDetail.asnFrom=datas
+      this.$refs.viewAsnDetail.queryAsnDetail(datas.id)
+      //this.$router.push({path:'/business-asn/viewAsnDetail',query: {ids:datas.id}})
     },
     //入库批量确认
     invVerifyS(data){
diff --git a/src/views/business-asn/asn/viewAsnDetail.vue b/src/views/business-asn/asn/viewAsnDetail.vue
index 238a919..4ca8a77 100644
--- a/src/views/business-asn/asn/viewAsnDetail.vue
+++ b/src/views/business-asn/asn/viewAsnDetail.vue
@@ -1,305 +1,314 @@
 <template>
   <div class="app-container">
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <!--     卡片头   -->
-        <div style="width: 100%;height: 180px;position: relative;">
-          <el-form ref="asnFromRes" :model="asnFrom" :rules="rules" size="small" label-width="80px">
-            <div style="width: 60%;height: 180px;float: left">
-              <el-form-item label="库区" prop="area">
-                <el-select v-model="asnFrom.area" prop="area" value-key="id" style="width: 100%"
-                           placeholder="请选择出库库区" clearable
-                >
-                  <el-option v-for="item in areaOptions" :key="item.id" :label="item.code" :value="item"/>
-                </el-select>
-              </el-form-item>
-              <div style="width: 100%;position: relative;height: 45px;">
-                <div style="width: 50%;float: left">
-                  <el-form-item label="单据类型" prop="billType">
-                    <el-select v-model="asnFrom.billType" value-key="id" style="width:100%"
-                               placeholder="请选择单据类型" clearable
-                    >
-                      <el-option
-                        v-for="item in billTypeOptions"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </div>
-                <div style="width: 50%;float: right">
-                  <el-form-item label="订单日期" prop="orderDate">
-                    <el-date-picker
-                      style="width: 100%"
-                      v-model="asnFrom.orderDate"
-                      type="date"
-                      value-format="yyyy-MM-dd"
-                      placeholder="选择日期"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                </div>
-              </div>
-              <div style="width: 100%;position: relative;height: 45px;">
-                <div style="width: 50%;float: left">
-                  <el-form-item label="单号" prop="code">
-                    <el-input :disabled="true" v-model="asnFrom.code" style="width: 100%"/>
-                  </el-form-item>
-                </div>
-                <div style="width: 50%;float: right">
-                  <el-form-item label="订单数量">
-                    <el-input :disabled="true" v-model="asnFrom.orderQuantity" style="width: 100%;"/>
-                  </el-form-item>
-                </div>
-              </div>
-              <div style="width: 100%;position: relative;">
-                <div style="width: 50%;float: left">
-                  <el-button type="primary" :disabled="asnFrom.code != null" @click="submitFromAsn(asnFrom)">提交
-                  </el-button>
-                </div>
-              </div>
 
-            </div>
-            <div style="width: 40%;height: 180px;float: right">
-              <el-form-item label="备注:">
+    <!--     卡片头   -->
+    <el-dialog :visible.sync="dialogInsertAsn"
+               center
+               top="0.5vh"
+               :fullscreen="fullscreen"
+               width="80%"
+               :before-close="handleClose"
+    >
 
-              </el-form-item>
-              <el-input v-model="asnFrom.description" type="textarea" :autosize="{ minRows: 5, maxRows: 8}"
-                        placeholder="请输入备注" style="width: 90%;height: 100%;float: right"
-              />
-            </div>
-          </el-form>
+      <template #title>
+        <div style="display: flex; align-items: center; justify-content: space-between;">
+          <span style="flex: 1; text-align: center;">新增入库单</span>
+          <div>
+            <i class="el-icon-full-screen" @click="fullscreen = !fullscreen"
+               style="cursor: pointer; margin-right: 20px;font-size: 13px;"></i>
+          </div>
         </div>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="primary"
-          size="mini"
-          @click="rkAndQxButtonM(1)"
-          :loading="logining1"
-        >
-          整单入库
+      </template>
+      <el-form ref="asnFromRes" :model="asnFrom" :rules="rules" size="small" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="单据类型" prop="billType">
+              <el-select v-model="asnFrom.billType" value-key="id"
+                         placeholder="请选择单据类型" clearable style="width: 100%"
+              >
+                <el-option
+                  v-for="item in billTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item"
+                />
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="订单日期" prop="orderDate">
+              <el-date-picker
+                style="width: 100%"
+                v-model="asnFrom.orderDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="凭证号" prop="code">
+              <el-input v-model="asnFrom.code"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="订单数量">
+              <el-input :disabled="true" v-model.number="asnFrom.orderQuantity"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注:">
+          <el-input v-model="asnFrom.description" type="textarea" :autosize="{ minRows: 3, maxRows: 5}"
+                    placeholder="请输入备注"
+          />
+        </el-form-item>
+        <el-button type="primary" size="small" @click="submitFromAsn(asnFrom)">提交
         </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="primary"
-          size="mini"
-          :disabled="!(crud.selections.length === 1)"
-          @click="dyrkM(crud.selections)"
-          :loading="logining2"
-        >
-          单一入库
-        </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="primary"
-          size="mini"
-          :disabled="crud.selections.length === 0"
-          @click="qxshM(crud.selections)"
-          :loading="logining3"
-        >
-          取消收货
-        </el-button>
-        <el-upload
-          class="upload-demo"
-          ref="upload"
-          slot='right'
-          style="float: right;padding-left: 5px"
-          :action="baseApi+'/api/importData/importAsnDetail?asnId='+this.asnId"
-          :file-list="fileList"
-          :on-success=handleSuccess
-          :on-error="handleError"
-          :headers="headers"
-          :show-file-list="true">
-          <el-button size="mini" type="success" icon="el-icon-upload">导入</el-button>
-        </el-upload>
-      </crudOperation>
-      <!--   单一入库   -->
-      <el-dialog title="单一入库" :visible.sync="dyrkTf" width="500px">
-        <!--        <el-dialog-->
-        <!--          width="30%"-->
-        <!--          title="内层 Dialog"-->
-        <!--          :visible.sync="innerVisible"-->
-        <!--          append-to-body>-->
-        <!--        </el-dialog>-->
-        <el-form ref="formdyrk" :model="asnDetailButton" label-width="80px">
-          <el-form-item label="数量" prop="oneRNumber" :rules="[
+      </el-form>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="订单明细信息" name="first">
+          <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+          <crudOperation :permission="permission" :tableKey="this.$options.name">
+            <el-button
+              slot="right"
+              class="filter-item"
+              type="primary"
+              size="mini"
+              @click="rkAndQxButtonM(1)"
+              :loading="logining1"
+            >
+              整单入库
+            </el-button>
+            <el-button
+              slot="right"
+              class="filter-item"
+              type="primary"
+              size="mini"
+              :disabled="!(crud.selections.length === 1)"
+              @click="dyrkM(crud.selections)"
+              :loading="logining2"
+            >
+              单一入库
+            </el-button>
+            <el-button
+              slot="right"
+              class="filter-item"
+              type="primary"
+              size="mini"
+              :disabled="crud.selections.length === 0"
+              @click="qxshM(crud.selections)"
+              :loading="logining3"
+            >
+              取消收货
+            </el-button>
+            <el-upload
+              class="upload-demo"
+              ref="upload"
+              slot='right'
+              style="float: right;padding-left: 5px"
+              :action="baseApi+'/api/importData/importAsnDetail?asnId='+this.asnId"
+              :file-list="fileList"
+              :on-success=handleSuccess
+              :on-error="handleError"
+              :headers="headers"
+              :show-file-list="true">
+              <el-button size="mini" type="success" icon="el-icon-upload">导入</el-button>
+            </el-upload>
+          </crudOperation>
+          <!--表格渲染-->
+          <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+                    @selection-change="crud.selectionChangeHandler" height="35vh"
+          >
+            <el-table-column type="selection" width="55"/>
+            <el-table-column prop="item.code " label="品番号" width="100px">
+              <template slot-scope="scope">
+                <div>{{ scope.row.item == null ? '' : scope.row.item.code }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="item.name" label="品番" width="100px">
+              <template slot-scope="scope">
+                <div>{{ scope.row.item == null ? '' : scope.row.item.name }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="item.unit" label="单位">
+              <template slot-scope="scope">
+                <div>{{ scope.row.item == null ? '' : scope.row.item.unit }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="orderQty" label="订单数量">
+              <template slot-scope="scope">
+                <div>{{ scope.row == null ? '' : scope.row.orderQty }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="receivedQty" label="收货数量">
+              <template slot-scope="scope">
+                <div>{{ scope.row == null ? '' : scope.row.receivedQty }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="point.code" label="库位">
+              <template slot-scope="scope">
+                <div>{{ scope.row.point == null ? '' : scope.row.point.code }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="propC1" label="批次号">
+              <template slot-scope="scope">
+                <div>{{ scope.row.propC1 }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="propC2" label="序列号"/>
+            <el-table-column prop="propD1" label="生产日期">
+              <template slot-scope="scope">
+                <div>{{ scope.row.propD1 }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="remark" label="备注">
+              <template slot-scope="scope">
+                <div>{{ scope.row.remark }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="checkPer(['admin','asnDetail:edit','asnDetail:del'])" label="操作"
+                             width="150px"
+                             align="center"
+            >
+              <template slot-scope="scope">
+                <udOperation
+                  :data="scope.row"
+                  :permission="permission"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页组件-->
+          <div style="float: right">
+            <pagination/>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+
+
+    <!--   单一入库   -->
+    <el-dialog title="单一入库" :visible.sync="dyrkTf" width="500px">
+      <!--        <el-dialog-->
+      <!--          width="30%"-->
+      <!--          title="内层 Dialog"-->
+      <!--          :visible.sync="innerVisible"-->
+      <!--          append-to-body>-->
+      <!--        </el-dialog>-->
+      <el-form ref="formdyrk" :model="asnDetailButton" label-width="80px">
+        <el-form-item label="数量" prop="oneRNumber" :rules="[
       { required: true, message: '数量不能为空'},
       { type: 'number', message: '数量必须为数字值'}
         ]"
-          >
-            <el-input v-model.number="asnDetailButton.oneRNumber" placeholder="请输入数量" style="width: 250px"/>
-          </el-form-item>
-          <el-form-item label="库位" prop="oneRPoint" :rules="[
+        >
+          <el-input v-model.number="asnDetailButton.oneRNumber" placeholder="请输入数量" style="width: 250px"/>
+        </el-form-item>
+        <el-form-item label="库位" prop="oneRPoint" :rules="[
            { required: true, message: '库位不能为空'}
         ]"
+        >
+          <el-select v-model="asnDetailButton.oneRPoint" value-key="id" placeholder="请选择库位"
+                     style="width: 250px">
+            <el-option
+              v-for="(item,index) in pointOptions"
+              :key="item.id+''+item.code"
+              :label="item.code"
+              :value="item"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dyrkTf = false">取 消</el-button>
+        <el-button type="primary" @click="rkAndQxButtonM(2)">确认</el-button>
+      </div>
+    </el-dialog>
+    <!--表单组件-->
+    <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+               :title="crud.status.title" width="400px"
+    >
+      <el-form ref="form" :rules="asnDetailRules" :model="form" size="small" label-width="80px"
+               style="height: 200px"
+      >
+
+        <el-form-item label="物料" prop="item" style="float: left">
+          <el-select v-model="form.item" value-key="id" filterable placeholder="请选择品番" style="width: 200px;"
+                     @change="getPointList(form.item,$event.code,asn)"
+                     clearable
           >
-            <el-select v-model="asnDetailButton.oneRPoint" value-key="id" placeholder="请选择库位" style="width: 250px">
-              <el-option
-                v-for="(item,index) in pointOptions"
-                :key="item.id+''+item.code"
-                :label="item.code"
-                :value="item"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-        </el-form>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dyrkTf = false">取 消</el-button>
-          <el-button type="primary" @click="rkAndQxButtonM(2)">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
-                 :title="crud.status.title" width="400px"
-      >
-        <el-form ref="form" :rules="asnDetailRules" :model="form" size="small" label-width="80px"
-                 style="height: 200px"
-        >
-          <el-form-item label="物料" prop="item" style="float: left">
-            <el-select v-model="form.item" value-key="id" filterable placeholder="请选择品番" style="width: 200px;"
-                       @change="getPointList(form.item,$event.code,asn)"
-                       clearable
+            <el-option
+              v-for="item in itemOptions"
+              :key="item.id"
+              :label="item.code"
+              :value="item"
             >
-              <el-option
-                v-for="item in itemOptions"
-                :key="item.id"
-                :label="item.code"
-                :value="item"
-              >
-                <span style="float: left">{{ item.code }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="订单数量" prop="orderQty" style="float: left">
-            <el-input v-model="form.orderQty" style="width: 200px;"/>
-          </el-form-item>
-          <el-form-item v-if="pointTF" label="库位" prop="point" style="float: left">
-            <el-select v-model="form.point" value-key="id" filterable placeholder="请选择库位" clearable
-                       style="width: 200px;"
-            >
-              <el-option
-                v-for="item in pointOptions"
-                :key="item.id"
-                :label="item.code"
-                :value="item"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item  v-if="viewPropC1" label="批次号" prop="propC1" style="float: left">
-            <el-input v-model="form.propC1" style="width: 200px;"/>
-          </el-form-item>
-          <el-form-item  v-if="viewPropC2" label="序列号" prop="propC2" style="float: left">
-            <el-input v-model="form.propC2" style="width: 200px;"/>
-          </el-form-item>
-
-          <el-form-item label="备注" prop="remark" style="float: left">
-            <el-input type="textarea" :rows="2" v-model="form.remark" style="width: 200px;"/>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
-                @selection-change="crud.selectionChangeHandler" :height="crud.tableHeight"
-      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="item.code " label="品番号" width="100px">
-          <template slot-scope="scope">
-            <div>{{ scope.row.item == null ? '' : scope.row.item.code }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="item.name" label="品番" width="100px">
-          <template slot-scope="scope">
-            <div>{{ scope.row.item == null ? '' : scope.row.item.name }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="item.unit" label="单位">
-          <template slot-scope="scope">
-            <div>{{ scope.row.item == null ? '' : scope.row.item.unit }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="orderQty" label="订单数量">
-          <template slot-scope="scope">
-            <div>{{ scope.row == null ? '' : scope.row.orderQty }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="receivedQty" label="收货数量">
-          <template slot-scope="scope">
-            <div>{{ scope.row == null ? '' : scope.row.receivedQty }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="point.code" label="库位">
-          <template slot-scope="scope">
-            <div>{{ scope.row.point == null ? '' : scope.row.point.code }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="propC1" label="批次号">
-          <template slot-scope="scope">
-            <div>{{ scope.row.propC1 }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="propC2" label="序列号"/>
-        <el-table-column  prop="propD1" label="生产日期">
-          <template slot-scope="scope">
-            <div>{{ scope.row.propD1 }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="remark" label="备注">
-          <template slot-scope="scope">
-            <div>{{ scope.row.remark }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="checkPer(['admin','asnDetail:edit','asnDetail:del'])" label="操作" width="150px"
-                         align="center"
-        >
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
+              <span style="float: left">{{ item.code }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单数量" prop="orderQty" style="float: left">
+          <el-input v-model="form.orderQty" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item v-if="pointTF" label="库位" prop="point" style="float: left">
+          <el-select v-model="form.point" value-key="id" filterable placeholder="请选择库位" clearable
+                     style="width: 200px;"
+          >
+            <el-option
+              v-for="item in pointOptions"
+              :key="item.id"
+              :label="item.code"
+              :value="item"
             />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination/>
-    </el-card>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="viewPropC1" label="批次号" prop="propC1" style="float: left">
+          <el-input v-model="form.propC1" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item v-if="viewPropC2" label="序列号" prop="propC2" style="float: left">
+          <el-input v-model="form.propC2" style="width: 200px;"/>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark" style="float: left">
+          <el-input type="textarea" :rows="2" v-model="form.remark" style="width: 200px;"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import crudAsnDetail, { rkAndQxButton } from '@/api/asnDetail'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import crudAsnDetail, {rkAndQxButton} from '@/api/asnDetail'
+import CRUD, {presenter, header, form, crud} from '@crud/crud'
 import rrOperation from '@crud/RR.operation.vue'
 import crudOperation from '@crud/CRUD.operation.vue'
 import udOperation from '@crud/UD.operation.vue'
 import pagination from '@crud/Pagination.vue'
-import { queryItemAll } from '@/api/item'
+import {queryItemAll} from '@/api/item'
 import Search from '@/views/monitor/log/search.vue'
 import AsnTask from '@/views/business-asn/asnDetail/viewAsnTask.vue'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
-import { getToken } from '@/utils/auth'
-import { queryPointList } from '@/api/point'
-import { getIdByAsn } from '@/api/asn'
+import {getToken} from '@/utils/auth'
+import {queryPointList} from '@/api/point'
+import {getIdByAsn} from '@/api/asn'
 import {getAreas, queryAreaList} from '@/api/area'
-import { getBillTypes} from '@/api/billType'
+import {getBillTypes} from '@/api/billType'
 import crudAsn from '@/api/asn'
-import { queryBomAccountList } from '@/api/bomAccount'
+import {queryBomAccountList} from '@/api/bomAccount'
 import {mapGetters} from "vuex";
 
+
 const defaultForm = {
   id: null,
   asn: null,
@@ -337,7 +346,15 @@ const asnQuery = {
 }
 export default {
   name: 'viewAsnDetail',
-  components: { DateRangePicker, AsnTask, Search, pagination, crudOperation, rrOperation, udOperation },
+  components: {
+    DateRangePicker,
+    AsnTask,
+    Search,
+    pagination,
+    crudOperation,
+    rrOperation,
+    udOperation
+  },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['asn_status'],
   cruds() {
@@ -345,9 +362,9 @@ export default {
       title: '收货数据',
       url: 'api/asnDetail',
       idField: 'id',
-      query: { asnId: 0 },
+      query: {asnId: this.asnFrom == null ? 0 : this.asnFrom.id},
       sort: 'id,desc',
-      crudMethod: { ...crudAsnDetail },
+      crudMethod: {...crudAsnDetail},
       optShow: {
         add: true,
         edit: false,
@@ -357,19 +374,6 @@ export default {
       }
     })
   },
-  created() {
-    //判断是否有数据
-    this.crud.query = asnQuery
-    let ids = this.$route.query.ids
-    if (ids != null) {
-      this.crud.query.asnId = ids
-      this.asnId = ids
-    } else {
-      this.crud.query.asnId = 0
-      this.asnId = 0
-    }
-    this.crud.refresh()
-  },
   computed: {
     ...mapGetters([
       'baseApi'
@@ -377,8 +381,16 @@ export default {
   },
   data() {
     return {
-      fileList:[],
-      headers: { 'Authorization': getToken() },
+      fullscreen: false,
+      activeName: 'first',
+      dialogInsertAsn: false,
+      isResizing: false,
+      initialWidth: 0,
+      initialHeight: 0,
+      initialX: 0,
+      initialY: 0,
+      fileList: [],
+      headers: {'Authorization': getToken()},
       permission: {
         add: ['admin', 'asnDetail:add'],
         edit: ['admin', 'asnDetail:edit'],
@@ -386,21 +398,24 @@ export default {
       },
       rules: {
         area: [
-          { required: true, message: '出库库区不能为空', trigger: 'blur' }
+          {required: true, message: '出库库区不能为空', trigger: 'blur'}
         ],
         orderDate: [{
           required: true, message: '订单日期不能为空', trigger: 'blur'
         }],
         billType: [{
           required: true, message: '单据类型不能为空', trigger: 'blur'
+        }],
+        code: [{
+          required: true, message: '凭证号不能为空', trigger: 'blur'
         }]
       },
       asnDetailRules: {
         item: [
-          { required: true, message: '物料不能为空', trigger: 'blur' }
+          {required: true, message: '物料不能为空', trigger: 'blur'}
         ],
         orderQty: [
-          { required: true, message: '订单数量不能为空', trigger: 'blur' }
+          {required: true, message: '订单数量不能为空', trigger: 'blur'}
         ]
         // point: [
         //   { required: true, message: '库位不能为空', trigger: 'blur' }
@@ -444,7 +459,7 @@ export default {
         createTime: null,
         updateTime: null
       },
-      detailId:0,
+      detailId: 0,
       //主id
       asnId: 0,
       asn: {},
@@ -460,15 +475,16 @@ export default {
       logining1: false,
       logining2: false,
       logining3: false,
-      pointTF:false,
-      viewPropC1:false,
-      viewPropC2:false,
+      pointTF: false,
+      viewPropC1: false,
+      viewPropC2: false,
     }
   },
   // beforeDestroy() {    //页面关闭时清除定时器
   //   clearInterval(this.clearTimeSet);
   // },
   mounted() {
+
     //查询公用的下拉数据
     this.getOnceOptionAll()
     //判断是否是新增主表和是查看明细新政附表
@@ -487,6 +503,23 @@ export default {
       this.asnTF()
       return true
     },
+    queryAsnDetail(ansId) {
+      this.asnFrom.id = ansId
+      this.crud.query = {asnId: ansId}
+      this.crud.toQuery()
+    },
+    handleClick(tab, event) {
+    },
+    handleClose(done) {
+      // 清空表单数据
+      this.asnFrom = {};
+      // 清空表格数据
+      this.crud.data = [];
+      //还原默认值
+      this.fullscreen = false
+      // 执行关闭操作
+      done();
+    },
     setTime() { //设置定时器
       // this.clearTimeSet=setInterval(() => {
       //   this.asnTF();
@@ -500,17 +533,18 @@ export default {
       const day = date.getDate().toString().padStart(2, '0')
       //存当前时间
       this.asnFrom.orderDate = `${year}-${month}-${day}`
-    },
+    }
+    ,
     //查询库位
-    getPointList(itObj,code, data) {
+    getPointList(itObj, code, data) {
       console.log(itObj)
-      if(itObj!=null) {
+      if (itObj != null) {
         this.viewPropC1 = itObj.bepc;
         this.viewPropC2 = itObj.bexq;
       }
       if (data.area.bexb) {
-        this.pointTF=true;
-        let selectDate = { rAreaCode: null, itemCode: null }
+        this.pointTF = true;
+        let selectDate = {rAreaCode: null, itemCode: null}
         selectDate.rAreaCode = data.area.code
         selectDate.itemCode = code
         // if (selectDate.rAreaCode === null) {
@@ -529,18 +563,19 @@ export default {
             this.pointOptions = this.filterListObj(data_)
           }
           if (!(this.pointOptions.length > 0)) {
-            queryPointList({ code: 'ZZKW' }).then(re => {
+            queryPointList({code: 'ZZKW'}).then(re => {
               this.pointOptions = re
             })
           }
         })
-      }else {
-        this.pointTF=false;
-        queryPointList({ type: 'CH' }).then(re => {
+      } else {
+        this.pointTF = false;
+        queryPointList({type: 'CH'}).then(re => {
           this.pointOptions = re
         })
       }
-    },
+    }
+    ,
     //过滤重复数据
     filterListObj(listObj) {
       let date = []
@@ -557,7 +592,8 @@ export default {
         }
       })
       return date
-    },
+    }
+    ,
     //查询公用的下拉数据
     getOnceOptionAll() {
       //物料数据
@@ -575,11 +611,12 @@ export default {
         this.areaOptions = res
       })
       //获取单据类型
-      getBillTypes({type:'100001',enabled:true}).then(res=>{
+      getBillTypes({type: '100001', enabled: true}).then(res => {
         this.billTypeOptions = res
       })
 
-    },
+    }
+    ,
 
     //判断是否是新增主表和是查看明细新政附表
     asnTF() {
@@ -600,7 +637,8 @@ export default {
       } else {
         this.getNewDate()
       }
-    },
+    }
+    ,
     //新增主表数据
     submitFromAsn(data) {
       //校验
@@ -612,16 +650,21 @@ export default {
             //加载数据
             this.asnTF()
             this.$message.success('添加成功')
-            // this.crud.toQuery()
-            this.$router.push({ path: '/business-asn/viewAsnDetail', query: { ids: res.id } })
+            this.crud.toQuery()
+            //this.$router.push({path: '/business-asn/viewAsnDetail', query: {ids: res.id}})
           })
         } else {
           return false
         }
       })
-    },
+    }
+    ,
     rkAndQxButtonM(num) {
       if (num === 1) {   //整单入库
+        console.log()
+        if (this.asnFrom.id <= 0) {
+          this.crud.notify('请先提交入库单', CRUD.NOTIFICATION_TYPE.ERROR)
+        }
         this.logining1 = true
         let data = this.asnDetailButton
         data.button = num
@@ -639,7 +682,7 @@ export default {
             this.logining2 = true
             let data = this.asnDetailButton
             data.button = num
-            data.id =this.detailId
+            data.id = this.detailId
             rkAndQxButton(data).then(res => {
               this.$message.success(res)
               this.dyrkTf = false
@@ -666,27 +709,31 @@ export default {
           this.logining3 = false
         })
       }
-    },
+    }
+    ,
     //单一入库
     dyrkM(data) {
-      this.detailId=data[0].id;
+      this.detailId = data[0].id;
       this.dyrkTf = !this.dyrkTf
       console.log(data[0].item.code)
-      this.getPointList(null,data[0].item.code, this.asn)
+      this.getPointList(null, data[0].item.code, this.asn)
       this.asnDetailButton.asnDetailData = data[0]
-    },
+    }
+    ,
     //取消收货
     qxshM(data) {
       this.asnDetailButton.asnDetailDataS = data
       this.rkAndQxButtonM(3)
-    },
+    }
+    ,
     handleSuccess(response, file, fileList) {
       this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       this.$refs.upload.clearFiles()
       this.crud.status.add = CRUD.STATUS.NORMAL
       this.crud.resetForm()
       this.crud.toQuery()
-    },
+    }
+    ,
     // 监听上传失败
     handleError(e, file, fileList) {
       const msg = JSON.parse(e.message)
@@ -702,5 +749,9 @@ export default {
 </script>
 
 <style scoped>
-
+.vue-draggable-resizable {
+  border: 1px solid #ccc;
+  background-color: white;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+}
 </style>