Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!192

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/assets/styles/element-ui.scss

@@ -89,4 +89,9 @@
   > .el-submenu__title
   .el-submenu__icon-arrow {
   display: none;
+}
+
+
+.el-autocomplete-suggestion .el-autocomplete-suggestion__wrap{
+  padding: 10px 0 0 0;
 }

src/components/ImageUpload/index.vue

@@ -15,16 +15,20 @@
       :headers="headers"
       :file-list="fileList"
       :on-preview="handlePictureCardPreview"
-      :class="{hide: this.fileList.length >= this.limit}"
+      :class="{ hide: this.fileList.length >= this.limit }"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-    
+
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+      <template v-if="fileSize">
+        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+      </template>
+      <template v-if="fileType">
+        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+      </template>
       的文件
     </div>
 
@@ -55,7 +59,7 @@ export default {
     },
     // 大小限制(MB)
     fileSize: {
-       type: Number,
+      type: Number,
       default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
@@ -66,8 +70,8 @@ export default {
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -81,7 +85,7 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      fileList: []
+      fileList: [],
     };
   },
   watch: {
@@ -89,14 +93,14 @@ export default {
       handler(val) {
         if (val) {
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(",");
           // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
+          this.fileList = list.map((item) => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
+                item = { name: this.baseUrl + item, url: this.baseUrl + item };
               } else {
-                  item = { name: item, url: item };
+                item = { name: item, url: item };
               }
             }
             return item;
@@ -107,8 +111,8 @@ export default {
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   computed: {
     // 是否显示提示
@@ -125,7 +129,7 @@ export default {
         if (file.name.lastIndexOf(".") > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
         }
-        isImg = this.fileType.some(type => {
+        isImg = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
@@ -135,7 +139,9 @@ export default {
       }
 
       if (!isImg) {
-        this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`);
+        this.$modal.msgError(
+          `文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`
+        );
         return false;
       }
       if (this.fileSize) {
@@ -167,8 +173,8 @@ export default {
     },
     // 删除图片
     handleDelete(file) {
-      const findex = this.fileList.map(f => f.name).indexOf(file.name);
-      if(findex > -1) {
+      const findex = this.fileList.map((f) => f.name).indexOf(file.name);
+      if (findex > -1) {
         this.fileList.splice(findex, 1);
         this.$emit("input", this.listToString(this.fileList));
       }
@@ -202,25 +208,25 @@ export default {
           strs += list[i].url.replace(this.baseUrl, "") + separator;
         }
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
-    }
-  }
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
+    },
+  },
 };
 </script>
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
 ::v-deep.hide .el-upload--picture-card {
-    display: none;
+  display: none;
 }
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {
-    transition: all 0s;
+  transition: all 0s;
 }
 
-::v-deep .el-list-enter, .el-list-leave-active {
-    opacity: 0;
-    transform: translateY(0);
+::v-deep .el-list-enter,
+.el-list-leave-active {
+  opacity: 0;
+  transform: translateY(0);
 }
 </style>
-

src/components/file-preview/index.vue

@@ -59,6 +59,7 @@ export default {
   },
   data() {
     return {
+      separator: ";",
       visible: false,
       fileList: [],
     };

src/components/popover-select-v2/index.vue

@@ -60,6 +60,15 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
+        if (!value) {
+          const {
+            $props: { source, dataMapping },
+          } = this;
+          for (let key in dataMapping) {
+            source[key] = undefined;
+          }
+          this.$emit("update:source", source);
+        }
       },
     },
     tableColumns() {
@@ -113,6 +122,8 @@ export default {
     // reset
     async useReset() {
       this.data = [];
+      this.page.pageNum = 1;
+      this.page.pageSize = 10;
       this.model.search = null;
       await this.fetchList(this.model, this.page);
     },
@@ -123,6 +134,7 @@ export default {
     // auto
     async useAutocomplete(prop, cb) {
       if (prop) {
+        this.page.pageSize = 25;
         this.model.search = prop;
         await this.fetchList(this.model, this.page);
         await cb(this.data);
@@ -143,8 +155,8 @@ export default {
       for (let key in dataMapping) {
         source[key] = prop[dataMapping[key]];
       }
+      this.innerValue = prop[valueKey];
       this.$emit("update:source", source);
-      this.$emit("input", prop[valueKey]);
       this.$emit("change", prop, this.$props);
     },
   },
@@ -153,7 +165,7 @@ export default {
   destroyed() {},
 };
 </script>
-<!-- v-on="$listeners" -->
+
 <template>
   <div class="popover-select-v2">
     <el-autocomplete
@@ -170,7 +182,7 @@ export default {
           style="
             text-overflow: ellipsis;
             overflow: hidden;
-            line-height: 16px;
+            line-height: 15px;
             margin: 5px 0;
           "
         >
@@ -180,7 +192,7 @@ export default {
           style="
             font-size: 12px;
             color: #b4b4b4;
-            line-height: 16px;
+            line-height: 15px;
             margin: 5px 0;
           "
         >
@@ -225,9 +237,9 @@ export default {
       </template>
       <el-form
         v-loading="loading"
+        :size="size"
         :inline="true"
         :model="model"
-        :size="size"
         @submit.native.prevent
       >
         <el-form-item prop="search">
@@ -246,8 +258,8 @@ export default {
           :size="size"
           height="45vh"
           highlight-current-row
-          @row-click="useSelect([$event])"
           @row-dblclick="useConfirm"
+          @row-click="useSelect([$event])"
         >
           <el-table-column
             v-for="(column, index) in tableColumns"

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/apply/column.js

@@ -29,7 +29,7 @@ export const SearchColumns = [
   {
     item: { key: "supplierName", title: "供应商" },
     attr: {
-      component: "el-popover-select-v2",
+      is: "el-popover-select-v2",
       referName: "SUPPLIER_PARAM",
       valueKey: "name",
       dataMapping: { supplier: "id", supplierName: "name" },
@@ -38,25 +38,29 @@ export const SearchColumns = [
   {
     item: { key: "puOrgName", title: "采购组织" },
     attr: {
-      component: "el-popover-select-v2",
+      is: "el-popover-select-v2",
       referName: "ORG_PARAM",
       valueKey: "name",
       dataMapping: { puOrg: "id", puOrgName: "name" },
     },
+    on: {
+      change: true,
+      "keyup.enter.native": true,
+    },
   },
   {
     item: { key: "buyerName", title: "采购员" },
     attr: {
-      component: "el-popover-select-v2",
+      is: "el-popover-select-v2",
       referName: "CONTACTS_PARAM",
       valueKey: "name",
-      dataMapping: { buyer: "id", buyerName: "name" },
+      dataMapping: { buyer: "code", buyerName: "name" },
     },
   },
   {
     item: { key: "currencyName", title: "币种" },
     attr: {
-      component: "el-popover-select-v2",
+      is: "el-popover-select-v2",
       referName: "CURRENCY_PARAM",
       valueKey: "name",
       dataMapping: { currency: "id", currencyName: "name" },
@@ -65,7 +69,7 @@ export const SearchColumns = [
   {
     item: { key: "puDeptName", title: "采购部门" },
     attr: {
-      component: "el-popover-select-v2",
+      is: "el-popover-select-v2",
       referName: "DEPT_PARAM",
       valueKey: "name",
       dataMapping: { puDept: "id", puDeptName: "name" },
@@ -74,7 +78,7 @@ export const SearchColumns = [
   {
     item: { key: "isEffective", title: "是否推价" },
     attr: {
-      component: "el-select",
+      is: "el-select",
       dictName: "is_effective",
       clearable: true,
     },
@@ -82,9 +86,9 @@ export const SearchColumns = [
   {
     item: { key: "status", title: "状态" },
     attr: {
-      component: "el-select",
+      is: "el-select",
       dictName: "sys_status",
       clearable: true,
     },
   },
-];
+];

src/views/purchase/apply/edit/index.vue

@@ -69,9 +69,6 @@ export default {
           }
         );
       }
-      if (type === "ORG_PARAM") {
-        console.log(prop, type, source);
-      }
     },
     //
     async fetchItem(prop) {
@@ -119,7 +116,7 @@ export default {
       const { tableColumns } = tabColumns.find(
         (element) => element.key === prop
       );
-      this.params[prop].push(initParams(tableColumns));
+      this.params[prop].push({ ...initParams(tableColumns), delFlag: "0" });
     },
     //
     async useRowRemove(prop, scope) {

src/views/purchase/apply/index.vue

@@ -198,7 +198,6 @@ export default {
               v-bind="column.attr"
               v-model="params[column.item.key]"
               :source.sync="params"
-              :is="column.attr.component"
               @change="useQuery(params, page)"
               @keyup.enter.native="useQuery(params, page)"
               style="width: 100%"
@@ -242,6 +241,7 @@ export default {
       v-if="tableData.length"
       :size="size"
       :data="tableData"
+      stripe
       highlight-current-row
       @row-dblclick="useSee"
       @selection-change="useSelect"

src/views/purchase/apply/see/index.vue

@@ -40,10 +40,10 @@ export default {
         this.loading = true;
         const { params } = this.$father;
         const {
-          code,
           total,
-          rows: [data],
+          rows: [{ id }],
         } = await LIST({ ...params }, { pageNum: prop, pageSize: 1 });
+        const { code, data } = await ITEM(id);
         if (code === 200) {
           this.params = data;
           this.params.$index = prop;
@@ -99,27 +99,37 @@ export default {
     :show-close="false"
     :visible.sync="visible"
   >
+    <div
+      style="
+        z-index: 6666;
+        position: fixed;
+        right: 20px;
+        top: 50%;
+        transform: translateY(-50%);
+        display: flex;
+        flex-direction: column;
+      "
+    >
+      <el-button
+        :size="size"
+        :disabled="params.$index === 1"
+        circle
+        icon="el-icon-top"
+        @click="fetchItem(params.$index - 1)"
+        style="margin: 0 0 10px 0"
+      ></el-button>
+      <el-button
+        :size="size"
+        :disabled="params.$index === params.$total"
+        circle
+        icon="el-icon-bottom"
+        @click="fetchItem(params.$index + 1)"
+        style="margin: 0"
+      ></el-button>
+    </div>
     <template slot="title">
       <span>{{ title }}</span>
       <span>
-        <el-tooltip effect="dark" content="上一页" placement="bottom-end">
-          <el-button
-            :size="size"
-            :disabled="params.$index === 1"
-            circle
-            icon="el-icon-top"
-            @click="fetchItem(params.$index - 1)"
-          ></el-button>
-        </el-tooltip>
-        <el-tooltip effect="dark" content="下一页" placement="bottom-end">
-          <el-button
-            :size="size"
-            :disabled="params.$index === params.$total"
-            circle
-            icon="el-icon-bottom"
-            @click="fetchItem(params.$index + 1)"
-          ></el-button>
-        </el-tooltip>
         <el-tooltip effect="dark" content="删 除" placement="bottom-end">
           <el-button
             :size="size"

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

@@ -109,6 +109,7 @@ export default {
             status: "0",
             source: "3",
             isClose:'N',
+            billDate: new Date().Format('yyyy-MM-dd'),
             closeTime:'',
             isInvoice:'N',
             isSendWms:'N',

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>