Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/api/business/purchase/purchase-order.js

@@ -126,7 +126,7 @@ const putInStorage = (data) =>{
     data: data,
   });
 }
-// 获取入库数据
+// 获取退货订单
 const returnedGoods = (data) =>{
   return request({
     url: "/pu/order/returnedGoods",

src/views/material/basicFile/details.vue

@@ -140,7 +140,6 @@
                   <el-row :gutter="10">
                     <el-col :span="8" v-for="f in basicData.form" style="text-align: right;">
                       <template v-if="f.show">
-                        <!--  :disabled="!(headerParam.isEdit && f.edit)" -->
 
                         <!-- 多选框 -->
                         <el-form-item v-if="f.attribute == 'checkbox'" style="text-align: left;" :prop="f.prop">
@@ -650,7 +649,8 @@
   import materialApi from '@/api/material/basic';
   import {getDicts as getDicts} from '@/api/system/dict/data'
   import arrayUtils from '../tools/arrayUtils';
-  import { initRules} from './init/index'
+  import { initRules} from './init/index';
+  import { getDetail } from '@/api/classify/basic';
 
   export default {
     name: 'material-details',
@@ -921,7 +921,6 @@
       },
       // 主标签页 列表双击
       handleMaindbClick(e) {
-        console.log(e, '主标签页 列表双击');
         this.otherDeatils.queryKey = e.id;
         this.otherDeatils.show = true;
         let activeTab = this.detailsTabs.filter(item => item.code == this.activeMainTab)[0];
@@ -932,12 +931,10 @@
       },
       // 主页签 列表数据选择
       handleMainChange(e) {
-        console.log(e, '主页签 列表数据选择');
         this.mainMsg.checkedList = e;
       },
       // 上传图片
       handleUpImage() {
-        console.log('上传图片');
       },
       // 编辑状态下，参照弹窗显示查询数据
       handleQueryMore(msg, val, target) {
@@ -2153,6 +2150,7 @@
         },
         deep: true,
       },
+      // 通过一级分类判断业务线是否必填
       "basicData.value.oneClass": {
         handler(nVal, oVal) {
 
@@ -2175,7 +2173,35 @@
         },
         deep: true,
       },
+      // 物料分类改变同时改变一二三级分类
+      "basicData.value.classifyId": {
 
+        async handler(nVal, oVal) {
+
+          if(nVal !== oVal){
+
+            try {
+
+              let {code, data }  = await getDetail(nVal);
+
+              if( code == 200){
+
+                let {oneClass,twoClass,threeClass} = data;
+
+                this.basicData.value['oneClass'] = oneClass;
+
+                this.basicData.value['twoClass'] = twoClass;
+
+                this.basicData.value['threeClass'] = threeClass;
+
+              }
+              
+            } catch (error) {}
+          }
+         
+        },
+        deep: true,
+      },
 
     },
 
@@ -2184,7 +2210,6 @@
       // 基本信息
       this.handleRest();
       if (window.name === '') {
-        console.log('页面首次被加载')
         this.$route.query.isEdit && this.handleBasicEdit();
       } else {
         console.log('页面被刷新')

src/views/material/basicFile/index.vue

@@ -215,7 +215,6 @@ export default {
     },
     // 修改
     handleEdit() {
-      console.log(this.checkedList, 'this.checkedList');
       if (this.checkedList.length == 1) {
         this.$router.push({
           path: `/material/basicFile/detail/${this.checkedList[0].id}`,
@@ -258,8 +257,6 @@ export default {
     },
     //查询 
     handleQuery() {
-
-      console.log('查询');
       this.getMaterialList('material');
     },
     // 重置查询条件
@@ -271,7 +268,6 @@ export default {
     },
     // 刷新
     handleRefresh() {
-      console.log('刷新');
       this.getMaterialList('material');
       for (const key in this.queryForm) {
         this.queryForm[key] = '';
@@ -295,7 +291,6 @@ export default {
         id: this.checkedList[0].id
       };
       materialApi.updateEnableMaterial(param).then(res => {
-        console.log(res, '启用/停用');
         if (res.code == 200) {
           this.handleRefresh();
           // 清空选中数据
@@ -314,7 +309,6 @@ export default {
     },
     // 批量导入
     handleImport() {
-      console.log('批量导入');
       this.importData.show = true
     },
     // 导入弹窗关闭前
@@ -324,7 +318,6 @@ export default {
     },
     // 导入弹窗操作
     handleImportData(type) {
-      console.log('导入弹窗操作');
       switch (type) {
         // 取消
         case 'cancal':
@@ -333,7 +326,6 @@ export default {
           break;
         // 确认
         case 'confirm':
-          console.log(this.importData.list, 'this.fileList');
           if (this.importData.list.length) {
 
             let formData = new FormData();
@@ -367,11 +359,9 @@ export default {
     // 文件发生改变
     handleChangeFile(file, fileList) {
       this.importData.list = fileList;
-      console.log(this.importData.list, '文件发生改变');
     },
     // 批量导出
     handleExport() {
-      console.log('批量导出', this.checkedList);
 
       let ids = this.checkedList.length ? this.checkedList.map(i => i.id) : [];
 
@@ -392,7 +382,6 @@ export default {
     },
     // 下载模板
     handleDownTemplate() {
-      console.log('下载模板');
       this.download('/system/material/download', {}, `物料基本信息模板.xlsx`)
     },
 
@@ -418,7 +407,6 @@ export default {
 
     // 双击行
     handledbClick(e) {
-      console.log(e, '双击行');
       this.$router.push({
         path: `/material/basicFile/detail/${e.id}`,
       });
@@ -436,7 +424,6 @@ export default {
     // 选中数据改变
     handleSelectionChange(list) {
       // this.checkedList = this.handleUnique([...this.checkedList, ...list], 'id');
-      // console.log(this.checkedList, '选中数据改变');
       // this.$emit('headerOption', JSON.stringify({ checkedList: [... this.checkedList] }))
     },
     // 行数据勾选操作 
@@ -448,7 +435,6 @@ export default {
     },
     //手动勾选全选 
     handleSelectAll(selection) {
-      // console.log(selection, '手动勾选全选--------------');
       this.checkedList = selection;
     },
     // 获取物料列表信息
@@ -497,7 +483,6 @@ export default {
     // this.getTagList('material');
   },
   beforeRouteEnter(to, from, next) {
-    console.log(to, 'to', from, 'beforeRouteEnter');
 
     next((vm) => {
       if (from.name == 'materialDetail') {
@@ -514,7 +499,6 @@ export default {
   },
   // 进入详情，保留查询条件
   beforeRouteLeave(to, from, next) {
-    console.log(to, 'to', from, 'beforeRouteLeave');
     if (to.name == 'materialDetail') {
       this.$store.commit('SET_QUERY', this.queryForm);
     } else {

src/views/purchase/PurchaseDemandList/add.vue

@@ -753,6 +753,37 @@ export default {
       this.basicForm.code = ''
       this.basicForm.createBy = ''
       this.basicForm.source = '4'
+      this.basicForm.puDemandItemList.forEach(item => {
+        item.status = ''
+        item.buyerName = ''
+        item.buyer = ''
+        item.reservedProportion = ''
+        item.reservedPeriod = ''
+        item.reservedQty = ''
+        item.averageQtyMonth = ''
+        item.demandPeriod = ''
+        item.forecastClassify = ''
+        item.onemonthAvgVolume = ''
+        item.threemonthAvgVolume = ''
+        item.superiorAllotQty = ''
+        item.resDemandQty = ''
+        item.executeQty = ''
+        item.deliveryWarehouseName = ''
+        item.deliveryWarehouse = ''
+        item.deliveryAllocationName = ''
+        item.deliveryAllocation = ''
+        item.lastWarehouseName = ''
+        item.lastAllocationName = ''
+        item.availableQty = ''
+        item.lastStockOrgName = ''
+        item.centralWarehouseQty = ''
+        item.allotCode = ''
+        item.deliveryAddress = ''
+        item.deliveryAddressName = ''
+        item.contacts = ''
+        item.contactsPhone = ''
+        item.address = ''
+      })
     },
     handleData() {
       console.log('222')
@@ -1117,16 +1148,26 @@ export default {
       }
     },
     // 粘贴来的数据
-    pasteMe(e, socpe) {
+    pasteMe(e, scope) {
       e.preventDefault() //阻止默认粘贴事件
       let source = e.clipboardData.getData("Text");
-      console.log('scope', socpe.column.property)
+      console.log('scope', scope.column.property)
       console.log('eee:', source)
       // 首先对源头进行解析
       let rows = source.split("\r\n"); // 拆成一个数组
       rows.pop()
       console.log('复制的数组',rows);
       console.log('列表的数组',this.basicForm.puDemandItemList)
+      rows.forEach(item => {
+        console.log('items',item)
+        this.basicForm.puDemandItemList.push(this.basicForm.puDemandItemList[scope.$index])
+      })
+      console.log('列表', this.basicForm.puDemandItemList)
+      // this.basicForm.puDemandItemList.forEach(e => {
+      //   rows.forEach(d => {
+      //     e.materialCode = d
+      //   })
+      // })
     },
     // 明细行选择物料编码带出数据
     chooseMaterial(index) {

src/views/purchase/purchase-order/purchaseReturn/column.js

@@ -1,34 +1,46 @@
 export const TableColumns = [
   // {key:"pkOrg",title:"库存组织"},
-  {key:"orgName",title:"库存组织"},
-  {key:"vbillcode",title:"单据编码"},
-  {key:"dbilldate",title:"单据日期"},
-  {key:"drpOrderCode",title:"drp订单编号"},
-  {key:"cwarehouseName",title:"仓库"},
-  {key:"billtypeName",title:"出入库类型"},
-  {key:"cwhsmanagerName",title:"库管员"},
-  {key:"cbizName",title:"采购员"},
-  {key:"cdptName",title:"采购部门"},
-  {key:"ntotalnum",title:"总数量"},
-  {key:"freplenishflag",title:"退库", inputType:"Checkbox", },
-  {key:"vreturnreason",title:"退货原因"},
-  {key:"syncSrm",title:"是否同步SRM", inputType:"Checkbox", },
-  {key:"modeProcess",title:"处理方式"},
-  {key:"receivingContact",title:"收货联系人"},
-  {key:"project",title:"项目"},
-  {key:"goodsWarehouse",title:"收货仓库"},
-  {key:"shippingAddress",title:"收货地址"},
-  {key:"customerDept",title:"客户部门"},
-  {key:"degreeEmergency",title:"紧急程度", inputType:"Checkbox", },
-  {key:"agent",title:"代理人"},
+  {key:"orgName",title:"库存组织", inputType:"Input", readonly:true,},
+  {key:"vbillcode",title:"单据编码", inputType:"Input", readonly:true,},
+  {key:"dbilldate",title:"单据日期", inputType:"DatePicker", disabled:true,valueFormat: "yyyy-MM-dd",},
+  {key:"drpOrderCode",title:"drp订单编号", inputType:"Input", readonly:true,},
+  {key:"cwarehouseName",title:"仓库", inputType:"Input", readonly:true,},
+  {key:"billtypeName",title:"出入库类型", inputType:"Input", readonly:true,},
+  {key:"cwhsmanagerName",title:"库管员", inputType:"Input", readonly:true,},
+  {key:"cbizName",title:"采购员", inputType:"Input", readonly:true,},
+  {key:"cdptName",title:"采购部门", inputType:"Input", readonly:true,},
+  {key:"ntotalnum",title:"总数量", inputType:"Input", readonly:true,},
+  {key:"freplenishflag",title:"退库", inputType:"Checkbox", width:80,  },
+  {key:"vreturnreason",title:"退货原因", inputType:"Input", readonly:true,},
+  {key:"syncSrm",title:"是否同步SRM", inputType:"Checkbox", width:80,disabled:true,},
+  {
+    key:"modeProcess",
+    title:"处理方式", 
+    inputType: "PopoverSelect",
+    valueKey: "id",
+    referName: "PROCESSTYPE_PARAM",
+    dataMapping: {
+      modeProcess: 'id',
+      modeProcessName: 'name'
+    },
+     isShow:true,
+    queryParams: () => ({}),
+   },
+  {key:"receivingContact",title:"收货联系人", inputType:"Input", readonly:true,},
+  {key:"project",title:"项目", inputType:"Input", readonly:true,},
+  {key:"goodsWarehouse",title:"收货仓库", inputType:"Input", readonly:true,},
+  {key:"shippingAddress",title:"收货地址", inputType:"Input", readonly:true,},
+  {key:"customerDept",title:"客户部门", inputType:"Input", readonly:true,},
+  {key:"degreeEmergency",title:"紧急程度", inputType:"Checkbox", width:80, disabled:true,},
+  {key:"agent",title:"代理人", inputType:"Input", readonly:true,},
   // {key:"agentName",title:"代理人"},
-  {key:"billmaker",title:"制单人"},
-  {key:"dmakedate",title:"制单日期"},
-  {key:"approver",title:"签字人"},
-  {key:"taudittime",title:"签字日期"},
-  {key:"modifiedtime",title:"最后修改时间"},
-  {key:"modifier",title:"最后修改人"},
-  {key:"vnote",title:"备注"},
+  {key:"billmaker",title:"制单人", inputType:"Input", readonly:true,},
+  {key:"dmakedate",title:"制单日期", inputType:"DatePicker", disabled:true,valueFormat: "yyyy-MM-dd",},
+  {key:"approver",title:"签字人", inputType:"Input", readonly:true,},
+  {key:"taudittime",title:"签字日期", inputType:"DatePicker", disabled:true,valueFormat: "yyyy-MM-dd",},
+  {key:"modifiedtime",title:"最后修改时间", inputType:"Input", disabled:true,},
+  {key:"modifier",title:"最后修改人", inputType:"Input", readonly:true,},
+  {key:"vnote",title:"备注", inputType:"Input", readonly:true,},
   
   
   // {key:"cdptvid",title:"采购部门"},
@@ -40,8 +52,8 @@ export const TableColumns = [
 
 // {key:"ncProcurementWarehouseDetailModels",title:"入库单明细"}
 export const DetailColumns =[
-  {key:"vsourceRowno",title:"来源单据行号"},
-  {key:"vsourcebillCode",title:"来源单据号"},
+  {key:"vsourceRowno",title:"行号", width:80, },
+  {key:"vsourcebillCode",title:"单据号", },
   {key:"materialCode",title:"物料编码"},
   {key:"materialName",title:"物料名称"},
   {key:"materialSpec",title:"规格"},
@@ -53,7 +65,7 @@ export const DetailColumns =[
   {key:"nassistnum",title:"实收数量"},
   {key:"nnum",title:"实收主数量"},
   {key:"dbizdate",title:"入库日期"},
-  {key:"flargess",title:"赠品", inputType:"Checkbox", },
+  {key:"flargess",title:"赠品", inputType:"Checkbox", width:80, },
   {key:"receivingCustomer",title:"收货客户"},
   {key:"udi",title:"UDI"},
   {key:"wmsRowNum",title:"WMS行号"},

src/views/purchase/purchase-order/purchaseReturn/index.vue

@@ -1,7 +1,7 @@
 <!-- 采购退货 -->
 <script>
 
-import { initColumns, initDicts, } from "@/utils/init/index.js";
+import { initColumns, initDicts,initParams } from "@/utils/init/index.js";
 import { TableColumns, DetailColumns} from './column';
 import orderApi from "@/api/business/purchase/purchase-order";
 
@@ -19,15 +19,22 @@ export default{
       puOrderId:'',
       columns:NewTableColumns,
       detailColumns:NewDetailColumns,
-      tableData:[],
-      detaildData:[],
+      params:{
+        ...initParams(NewTableColumns),
+        ncProcurementWarehouseDetailModels:[]
+      },
 
     }
   },
   methods:{
+
     setVisible(prop) {
 
       this.visible = prop;
+
+      if(!prop){
+
+      }
     
     },
 
@@ -44,7 +51,7 @@ export default{
         if(code == 200){
 
           console.log(data,'查询入库数据');
-          this.tableData = [...data];
+          this.params = data[0];
         }
 
       }catch(err){}
@@ -62,14 +69,23 @@ export default{
     handleCancel(){
       this.setVisible(false);
     },
-    handleConfirm(){},
-    handleFetchDetail(row){
-      console.log(row,'row-----------');
-      this.detaildData = row['ncProcurementWarehouseDetailModels'] ? 
-                         row['ncProcurementWarehouseDetailModels']: [];
-    },
-    handleSelect(selection, row){
+    handleConfirm(){
+      try {
+        this.loading = true;
+
+        let data = {
+          vbillCode:this.params.vbillCode,
+          crowno:[],
+        }
+        let { code, msg} = orderApi.returnedGoods(data);
+
+        if(code == 200){
 
+        }
+      } catch (error) {}
+      finally{
+        this.loading = false;
+      }
     },
     handleDetailSelect(selection, row){
 
@@ -93,110 +109,225 @@ export default{
     @close="$emit('close')"
     v-loading="loading"
   >
-   
-    <el-card :body-style="{
-      padding: '20px',
-      display: 'flex',
-      'flex-wrap': 'wrap',
-      }" 
-      style="margin: 10px"
-    >
-      <div slot="header" 
-        style="
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-        ">
-        <h3></h3>
-        <div style="text-align: right">
-          <el-button size="mini" @click="handleRefresh">刷新</el-button>
-          <el-button size="mini" type="primary" plain @click="handleConfirm">确定</el-button>
-          <el-button size="mini" @click="handleCancel">取 消</el-button>
-        </div>
-      </div>
-      
-      <!-- @row-dblclick="handleOpenSeeDrawer" 
-      @row-click="handleDetailsData"  -->
-      <el-table 
-        :data="tableData" 
-        size="mini"
-        highlight-current-row
-        @select="handleSelect"
-        @row-click="handleFetchDetail"
-        height="350"
-        style="width: 100%; margin: 20px 0 0 0"
+    <el-form
+      size="mini"
+      label-position="right"
+      ref="orderAddForm"
+      label-width="140px"
+      :model="params"
       >
-      <el-table-column type="selection" width="45" ></el-table-column>
-      <el-table-column type="index" width="50" label="序号"></el-table-column>
-        <el-table-column 
-          v-for="(column, index) in columns" 
-          :key="index" 
-          :prop="column.key" 
-          :label="column.title"
-          :width="column.width || 180" 
-          :show-overflow-tooltip="column.showOverflowTooltip || true"
-        >
-
-          <template slot-scope="scope">
-            <dict-tag v-if="column.inputType === 'Select'" 
-              size="small" 
-              :value="scope.row[column.key]"
-              :options="dict.type[column.referName]"
-            />
-
-            <el-checkbox v-else-if="column.inputType === 'Checkbox'"
-              v-model="scope.row[column.key]" 
-              disabled 
-              true-label="Y"
-              false-label="N"
-            > </el-checkbox>
-            <span v-else>{{ scope.row[column.key] }}</span>
-          </template>
-        </el-table-column>
-
-      </el-table>
-
-
-
-    </el-card>
-    <el-card :body-style="{
-      padding: '20px',
-      display: 'flex',
-      'flex-wrap': 'wrap',
-      position: 'relative',
-    }" style="margin: 10px">
-      <el-table 
-        :data="detaildData" 
-        style="width: 100%"
-        @select="handleDetailSelect"
+      <!-- :rules="rules" -->
+      <el-card :body-style="{
+        padding: '20px',
+        display: 'flex',
+        'flex-wrap': 'wrap',
+        }" 
+        style="margin: 10px"
       >
+        <div slot="header" 
+          style="
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          ">
+          <h3></h3>
+          <div style="text-align: right">
+            <el-button size="mini" @click="handleRefresh">刷新</el-button>
+            <el-button size="mini" type="primary" plain @click="handleConfirm">确定</el-button>
+            <el-button size="mini" @click="handleCancel">取 消</el-button>
+          </div>
+        </div>
+        
+        <el-row style="display:flex; flex-wrap: wrap;">
+            <el-col 
+              v-for="(column, index) in columns" 
+              :key="index" 
+              :span="column.span || 6"
+              >
+              <el-form-item :prop="column.key" :label="column.title">
+
+                <el-input v-if="column.inputType === 'Input'" 
+                  v-model="params[column.key]" 
+                  :placeholder="column.placeholder"
+                  :clearable="column.clearable" 
+                  :disabled="column.disabled" 
+                  :readonly="column.readonly"
+                  style="width: 100%"
+                  ></el-input>
+                <dr-popover-select v-if="column.inputType === 'PopoverSelect'" 
+                  v-model="params[column.key]" 
+                  size="mini"
+                  :value-key="column.valueKey" 
+                  :source.sync="params" 
+                  :title="column.title" 
+                  :type="column.referName"
+                  :multiple="column.multiple" 
+                  :placeholder="column.placeholder" 
+                  :data-mapping="column.dataMapping"
+                  :disabled="column.disabled" 
+                  :query-params="column.queryParams"
+                  @change="handleReferChange"
+                  ></dr-popover-select>
+                <el-input v-if="column.inputType === 'Textarea'" 
+                  v-model="params[column.key]" 
+                  type="textarea"
+                  :placeholder="column.placeholder" 
+                  :clearable="column.clearable" 
+                  :disabled="column.disabled"
+                  style="width: 100%"
+                  ></el-input>
+                <el-input-number v-if="column.inputType === 'InputNumber'" 
+                  v-model="params[column.key]"
+                  :precision="column.precision"
+                  :max="handleIsRevise(params.status) ? params[column.key] : Infinity"
+                  :controls-position="column.controlsPosition" 
+                  :placeholder="column.placeholder"
+                  :clearable="column.clearable" 
+                  :disabled="column.disabled" 
+                  style="width: 100%"
+                  ></el-input-number>
+                <el-select v-if="column.inputType === 'Select'" 
+                  v-model="params[column.key]" 
+                  :disabled="column.disabled"
+                  :clearable="column.clearable" 
+                  :placeholder="column.placeholder" 
+                  style="width: 100%"
+                  @change="handleSelectChange(column.key,column.referName)"
+                  >
+                  <el-option 
+                    v-for="item in dict.type[column.referName]" 
+                    :key="item.value" 
+                    :label="item.label"
+                    :value="item.value"
+                    ></el-option>
+                </el-select>
+                <el-select v-if="column.inputType === 'TagSelect'" 
+                  v-model="params[column.key]" 
+                  multiple 
+                  clearable
+                  collapse-tags 
+                  :placeholder="column.placeholder" 
+                  :clearable="column.clearable" 
+                  :disabled="column.disabled"
+                  style="width: 100%"
+                  >
+                  <template #prefix>
+                    <el-icon class="el-icon-view" style="cursor: pointer" @click.stop="$message.info(234)"></el-icon>
+                  </template>
+                  <el-option 
+                    v-for="item in options" 
+                    :key="item.value" 
+                    :label="item.label" 
+                    :value="item.value"
+                    ></el-option>
+                </el-select>
+                <el-date-picker v-if="column.inputType === 'DatePicker'" 
+                  v-model="params[column.key]" 
+                  :type="column.type"
+                  :placeholder="column.placeholder" 
+                  :clearable="column.clearable" 
+                  :disabled="column.disabled"
+                  :picker-options="column.pickerOptions" 
+                  style="width: 100%"
+                  ></el-date-picker>
+                <el-checkbox v-if="column.inputType === 'Checkbox'" 
+                  v-model="params[column.key]" 
+                  :disabled="column.disabled"
+                  true-label="Y"
+                  false-label="N"
+                  > </el-checkbox>
+                <file-upload-center v-if="column.inputType === 'Upload'" 
+                  v-model="params[column.key]"
+                  :file-type="column.fileType" 
+                  :disabled="handleIsRevise(params.status)"
+                  ></file-upload-center>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        <!-- <el-table 
+          :data="tableData" 
+          size="mini"
+          highlight-current-row
+          @select="handleSelect"
+          @row-click="handleFetchDetail"
+          height="200"
+          style="width: 100%; margin: 20px 0 0 0"
+        >
         <el-table-column type="selection" width="45" ></el-table-column>
-        <el-table-column 
-          v-for="(cColumn, cIndex) in detailColumns" 
-          :key="cIndex" 
-          :prop="cColumn.key"
-          :label="cColumn.title" 
-          :width="cColumn.width || 120"
+          <el-table-column 
+            v-for="(column, index) in columns" 
+            :key="column.key" 
+            :prop="column.key" 
+            :label="column.title"
+            :width="column.width || 180" 
+            :show-overflow-tooltip="column.showOverflowTooltip || true"
+          >
+
+            <template slot-scope="scope">
+              <dict-tag v-if="column.inputType === 'Select'" 
+                size="small" 
+                :value="scope.row[column.key]"
+                :options="dict.type[column.referName]"
+              />
+
+              <el-checkbox v-else-if="column.inputType === 'Checkbox'"
+                v-model="scope.row[column.key]" 
+                disabled 
+                true-label="Y"
+                false-label="N"
+              > </el-checkbox>
+              <span v-else>{{ scope.row[column.key] }}</span>
+            </template>
+          </el-table-column>
+
+        </el-table> -->
+      </el-card>
+
+
+      <el-card :body-style="{
+        padding: '20px',
+        display: 'flex',
+        'flex-wrap': 'wrap',
+        position: 'relative',
+        }" 
+        style="margin: 10px"
+      >
+        <el-table 
+          :data="params['ncProcurementWarehouseDetailModels']" 
+          style="width: 100%"
+          size="mini"
+          highlight-current-row
+          @select="handleDetailSelect"
         >
-          <template slot-scope="scope">
-            <dict-tag v-if="cColumn.inputType === 'Select'" 
-              size="small" 
-              :value="scope.row[cColumn.key]"
-              :options="dict.type[cColumn.referName]"
-            />
-
-            <el-checkbox v-else-if="cColumn.inputType === 'Checkbox'"
-              v-model="scope.row[cColumn.key]" 
-              disabled 
-              true-label="Y"
-              false-label="N"
-            > </el-checkbox>
-            <span v-else>{{ scope.row[cColumn.key] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-
-    </el-card>
+          <el-table-column type="selection" width="45" ></el-table-column>
+          <el-table-column 
+            v-for="(cColumn, cIndex) in detailColumns" 
+            :key="cColumn.key" 
+            :prop="cColumn.key"
+            :label="cColumn.title" 
+            :width="cColumn.width || 180"
+            :show-overflow-tooltip="cColumn.showOverflowTooltip || true"
+          >
+            <template slot-scope="scope">
+              <dict-tag v-if="cColumn.inputType === 'Select'" 
+                size="small" 
+                :value="scope.row[cColumn.key]"
+                :options="dict.type[cColumn.referName]"
+              />
+
+              <el-checkbox v-else-if="cColumn.inputType === 'Checkbox'"
+                v-model="scope.row[cColumn.key]" 
+                disabled 
+                true-label="Y"
+                false-label="N"
+              > </el-checkbox>
+              <span v-else>{{ scope.row[cColumn.key] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-card>
+    </el-form>
 
   </el-drawer>