调拨订单基本增删改查，采购需求单货权预留单弹窗

src/api/purchase/transferOrder.js

@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+// 调拨订单列表
+export function getOrderList(data) {
+  return request({
+    url: `/pu/allot/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    method: 'post',
+    data: data
+  })
+}
+// 调拨订单新增
+export function addOrder(data) {
+  return request({
+    url: `/pu/allot/add`,
+    method: 'post',
+    data: data
+  })
+}
+// 调拨订单编辑
+export function editOrder(data) {
+  return request({
+    url: `/pu/allot/edit`,
+    method: 'put',
+    data: data
+  })
+}
+// 调拨订单详情
+// 调拨订单详情
+export function getOrderDetail(id) {
+  return request({
+    url: `/pu/allot/detail/${id}`,
+    method: 'get',
+  })
+}
+// 调拨订单删除
+export function delOrder(ids) {
+  return request({
+    url: `/pu/allot/delete/${ids}`,
+    method: 'delete',
+  })
+}
+// 货权预留单详情
+export function getResevedDetail(id) {
+  return request({
+    url: `/pu/ownership/detail/${id}`,
+    method: 'get',
+  })
+}

src/views/purchase/PurchaseDemandList/add.vue

@@ -235,6 +235,7 @@
       <div class="btn_grooup">
         <el-button type="primary" size="small" @click="addLine">增行</el-button>
         <el-button type="primary" size="small" >批量调整</el-button>
+        <el-button type="primary" size="small" v-if="pageStu == 'check' || pageStu == 'edit'" @click="showReserved">货权预留单</el-button>
       </div>
 
       <el-table 
@@ -478,21 +479,30 @@
       <el-col :span="1.5">
         <el-button size="small" plain @click="back">返回</el-button>
       </el-col>
+
+      <Reserved v-if="dialog.config" :isVisible="dialog.config" :info="row" @updateReserved="updateReserved"/>
     </div>
   </div>
 </template>
 
 <script>
+import Reserved from './reserved.vue'
 import {addDemand,getDemandDetail, getDemandSonDetail, editDemand} from '@/api/purchase/purchaseDemand.js'
 export default {
   name: 'addDemandList',
   props: ['pageStu','row', 'disable'],
+  components: {
+    Reserved
+  },
   model: {
     prop: 'isList',
     event: 'jugislist'
   },
   data() {
     return {
+      dialog: {
+        config: false
+      },
       basicForm: {
         code: '',
         org: '',
@@ -681,6 +691,14 @@ export default {
       })
     },
     handleSelectionChange() {},
+    // 点击预留单展示
+    showReserved() {
+      this.dialog.config = true
+    },
+    // 修改是否让页面显示与隐藏的事件
+	  updateReserved (val) {
+      this.dialog.config = val
+    },
   }
 }
 </script>

src/views/purchase/PurchaseDemandList/reserved.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="reserved">
+    <el-dialog
+      title="货权预留单"
+      :visible.sync="visible"
+      :before-close="handleClose"
+      width="70%"
+    >
+      <el-table :data="tableList1">
+        <el-table-column property="date" label="预留单型号" width="150"></el-table-column>
+        <el-table-column property="date" label="来源单据号" width="150"></el-table-column>
+        <el-table-column property="date" label="客户" width="150"></el-table-column>
+        <el-table-column property="date" label="客户名称" width="150"></el-table-column>
+        <el-table-column property="date" label="创建人" width="150"></el-table-column>
+        <el-table-column property="date" label="创建人名称" width="150"></el-table-column>
+        <el-table-column property="date" label="创建时间" width="150"></el-table-column>
+        <el-table-column property="date" label="更新人" width="150"></el-table-column>
+        <el-table-column property="date" label="更新人名称" width="150"></el-table-column>
+        <el-table-column property="date" label="更新时间" width="150"></el-table-column>
+      </el-table>
+      <el-table style="margin-top: 50px" :data="tableList2">
+        <el-table-column property="date" label="物料编码" width="150"></el-table-column>
+        <el-table-column property="date" label="物料名称" width="150"></el-table-column>
+        <el-table-column property="date" label="单位" width="150"></el-table-column>
+        <el-table-column property="date" label="单位名称" width="150"></el-table-column>
+        <el-table-column property="date" label="预留数量" width="150"></el-table-column>
+        <el-table-column property="date" label="预留比例" width="150"></el-table-column>
+        <el-table-column property="date" label="预留周期" width="150"></el-table-column>
+        <el-table-column property="date" label="仓库" width="150"></el-table-column>
+        <el-table-column property="date" label="仓库名称" width="150"></el-table-column>
+        <el-table-column property="date" label="货位" width="150"></el-table-column>
+        <el-table-column property="date" label="货位名称" width="150"></el-table-column>
+        <el-table-column property="date" label="可用量" width="150"></el-table-column>
+        <el-table-column property="date" label="已用量" width="150"></el-table-column>
+      </el-table>
+      <el-table style="margin-top: 50px" :data="tableList3">
+        <el-table-column property="date" label="物料编码" width="150"></el-table-column>
+        <el-table-column property="date" label="物料名称" width="150"></el-table-column>
+        <el-table-column property="date" label="单位" width="150"></el-table-column>
+        <el-table-column property="date" label="单位名称" width="150"></el-table-column>
+        <el-table-column property="date" label="预留数量" width="150"></el-table-column>
+        <el-table-column property="date" label="预留比例" width="150"></el-table-column>
+        <el-table-column property="date" label="预留周期" width="150"></el-table-column>
+        <el-table-column property="date" label="调出仓库" width="150"></el-table-column>
+        <el-table-column property="date" label="调出仓库名称" width="150"></el-table-column>
+        <el-table-column property="date" label="调出货位" width="150"></el-table-column>
+        <el-table-column property="date" label="调出货位名称" width="150"></el-table-column>
+        <el-table-column property="date" label="调入仓库" width="150"></el-table-column>
+        <el-table-column property="date" label="调入仓库名称" width="150"></el-table-column>
+        <el-table-column property="date" label="调入货位" width="150"></el-table-column>
+        <el-table-column property="date" label="调入货位名称" width="150"></el-table-column>
+        <el-table-column property="date" label="调拨数量" width="150"></el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {getResevedDetail} from '@/api/purchase/transferOrder.js'
+export default {
+  props: {
+    isVisible: {
+      type: Boolean,
+      default: false
+    },
+    info: {
+      type: Object,
+      default: null
+    }
+  },
+  mounted() {
+    console.log('出现')
+    console.log(this.info)
+    this.getDetails(this.info)
+  },
+  data() {
+    return {
+      visible:this.isVisible,
+      tableList1: [],
+      tableList2: [],
+      tableList3: [],
+    }
+  },
+  methods: {
+    getDetails(row) {
+      getResevedDetail(row.id).then(res => {
+        if (res.code === 200) {
+          // this.basicForm = res.data
+        }
+      })
+    },
+    handleClose() {
+      console.log('调用')
+      this.$emit('updateReserved', false)
+    }
+  }
+}
+</script>

src/views/purchase/transferOrder/add.vue

@@ -5,7 +5,7 @@
         <el-col :span="1.5">
             <el-form-item label="订单类型">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.billType"
                 size="small"
                 placeholder=""
                 clearable
@@ -27,7 +27,7 @@
         <el-col :span="1.5">
             <el-form-item label="单据日期">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.billDate"
                 size="small"
                 placeholder=""
                 clearable
@@ -38,7 +38,7 @@
         <el-col :span="1.5">
             <el-form-item label="调拨方式">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.allotType"
                 size="small"
                 placeholder=""
                 clearable
@@ -49,7 +49,7 @@
         <el-col :span="1.5">
             <el-form-item label="调拨出库单号">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.deliveryCode"
                 size="small"
                 placeholder=""
                 clearable
@@ -60,7 +60,7 @@
         <el-col :span="1.5">
             <el-form-item label="调拨入库单号">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.storageCode"
                 size="small"
                 placeholder=""
                 clearable
@@ -71,7 +71,7 @@
         <el-col :span="1.5">
             <el-form-item label="调入库存组织">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.storageInventoryOrg"
                 size="small"
                 placeholder=""
                 clearable
@@ -82,7 +82,7 @@
         <el-col :span="1.5">
             <el-form-item label="调出业务员">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.businessPersonal"
                 size="small"
                 placeholder=""
                 clearable
@@ -93,7 +93,7 @@
         <el-col :span="1.5">
             <el-form-item label="调出部门">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.deliveryDept"
                 size="small"
                 placeholder=""
                 clearable
@@ -102,9 +102,9 @@
             </el-form-item>
          </el-col>
         <el-col :span="1.5">
-            <el-form-item label="人民币">
+            <el-form-item label="币种">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.currency"
                 size="small"
                 placeholder=""
                 clearable
@@ -115,7 +115,7 @@
         <el-col :span="1.5">
             <el-form-item label="折本汇率">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.rate"
                 size="small"
                 placeholder=""
                 clearable
@@ -126,7 +126,7 @@
         <el-col :span="1.5">
             <el-form-item label="在途归属">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.onRouteAffilliation"
                 size="small"
                 placeholder=""
                 clearable
@@ -137,7 +137,7 @@
         <el-col :span="1.5">
             <el-form-item label="总数量">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.qty"
                 size="small"
                 placeholder=""
                 clearable
@@ -148,7 +148,7 @@
         <el-col :span="1.5">
             <el-form-item label="结算路径">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.accountPath"
                 size="small"
                 placeholder=""
                 clearable
@@ -159,7 +159,7 @@
         <el-col :span="1.5">
             <el-form-item label="客户">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.customer"
                 size="small"
                 placeholder=""
                 clearable
@@ -170,7 +170,7 @@
         <el-col :span="1.5">
             <el-form-item label="调入仓库">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.storageWarehouse"
                 size="small"
                 placeholder=""
                 clearable
@@ -181,7 +181,7 @@
         <el-col :span="1.5">
             <el-form-item label="调出仓库">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.deliveryWarehouse"
                 size="small"
                 placeholder=""
                 clearable
@@ -192,7 +192,7 @@
         <el-col :span="1.5">
             <el-form-item label="物料项目组">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.materialProject"
                 size="small"
                 placeholder=""
                 clearable
@@ -214,7 +214,7 @@
         <el-col :span="1.5">
             <el-form-item label="是否已同步WMS">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.isSendWms"
                 size="small"
                 placeholder=""
                 clearable
@@ -225,7 +225,7 @@
         <el-col :span="1.5">
             <el-form-item label="备注">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.remark"
                 size="small"
                 placeholder=""
                 clearable
@@ -299,7 +299,7 @@
         <el-col :span="1.5">
             <el-form-item label="创建人">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.createByName"
                 size="small"
                 placeholder=""
                 clearable
@@ -321,7 +321,7 @@
         <el-col :span="1.5">
             <el-form-item label="最后修改人">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.updateByName"
                 size="small"
                 placeholder=""
                 clearable
@@ -349,41 +349,40 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="code"/>
-            <el-table-column label="物料编码" align="center" prop="code"/>
-            <el-table-column label="物料名称" align="center" prop="code"/>
+            <el-table-column label="行号" align="center" prop="rowno"/>
+            <el-table-column label="物料编码" align="center" prop="material"/>
+            <el-table-column label="物料名称" align="center" prop="materialName"/>
             <el-table-column label="调拨出库单号" align="center" prop="code"/>
             <el-table-column label="调拨入库单号" align="center" prop="code"/>
             <el-table-column label="规格" align="center" prop="code"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
-            <el-table-column label="产地" align="center" prop="code"/>
-            <el-table-column label="型号" align="center" prop="code"/>
-            <el-table-column label="类别" align="center" prop="code"/>
-            <el-table-column label="单位" align="center" prop="code"/>
-            <el-table-column label="调出仓库" align="center" prop="code"/>
-            <el-table-column label="数量" align="center" prop="code"/>
-            <el-table-column label="主单位" align="center" prop="code"/>
-            <el-table-column label="换算率" align="center" prop="code"/>
-            <el-table-column label="主数量" align="center" prop="code"/>
-            <el-table-column label="税率" align="center" prop="code"/>
-            <el-table-column label="调入仓库" align="center" prop="code"/>
-            <el-table-column label="批次号" align="center" prop="code"/>
-            <el-table-column label="产品批号" align="center" prop="code"/>
-            <el-table-column label="生产日期" align="center" prop="code"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="code"/>
-            <el-table-column label="批准文号" align="center" prop="code"/>
-            <el-table-column label="注册证号" align="center" prop="code"/>
-            <el-table-column label="商品名" align="center" prop="code"/>
-            <el-table-column label="通用名" align="center" prop="code"/>
-            <el-table-column label="剂型" align="center" prop="code"/>
-            <el-table-column label="调入调出结算规则明细" align="center" prop="code"/>
-            <el-table-column label="上市许可持有人" align="center" prop="code"/>
-            <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="code"/>
-            <el-table-column label="pi码" align="center" prop="code"/>
-            <el-table-column label="无税金额" align="center" prop="code"/>
-            <el-table-column label="备注" align="center" prop="code"/>
-            <el-table-column label="客户物料码" align="center" prop="code"/>
-            <el-table-column label="客户物料名称" align="center" prop="code"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+            <el-table-column label="产地" align="center" prop="originPlace"/>
+            <el-table-column label="型号" align="center" prop="model"/>
+            <el-table-column label="单位" align="center" prop="unit"/>
+            <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
+            <el-table-column label="数量" align="center" prop="qty"/>
+            <el-table-column label="主单位" align="center" prop="mainUnit"/>
+            <el-table-column label="换算率" align="center" prop="equation"/>
+            <el-table-column label="主数量" align="center" prop="mainQty"/>
+            <el-table-column label="税率" align="center" prop="rate"/>
+            <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
+            <el-table-column label="批次号" align="center" prop="patchNo"/>
+            <el-table-column label="产品批号" align="center" prop="producBatch"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
+            <el-table-column label="注册证号" align="center" prop="registration"/>
+            <el-table-column label="商品名" align="center" prop="productCode"/>
+            <el-table-column label="通用名" align="center" prop="commonCode"/>
+            <el-table-column label="剂型" align="center" prop="drug"/>
+            <el-table-column label="调入调出结算规则明细" align="center" prop="ruleDetail"/>
+            <el-table-column label="上市许可持有人" align="center" prop="marketingApprovalPersonal"/>
+            <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production"/>
+            <el-table-column label="pi码" align="center" prop="pi"/>
+            <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
+            <!-- <el-table-column label="备注" align="center" prop="code"/> -->
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
           </el-tab-pane>
 
@@ -393,35 +392,35 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="code"/>
-            <el-table-column label="调拨出库单号" align="center" prop="code"/>
-            <el-table-column label="调拨入库单号" align="center" prop="code"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
-            <el-table-column label="产地" align="center" prop="code"/>
-            <el-table-column label="类别" align="center" prop="code"/>
-            <el-table-column label="调出仓库" align="center" prop="code"/>
-            <el-table-column label="调入仓库" align="center" prop="code"/>
-            <el-table-column label="收货利润中心" align="center" prop="code"/>
-            <el-table-column label="发货利润中心" align="center" prop="code"/>
-            <el-table-column label="调入业务员" align="center" prop="code"/>
-            <el-table-column label="产品批号" align="center" prop="code"/>
-            <el-table-column label="生产日期" align="center" prop="code"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="code"/>
-            <el-table-column label="批准文号" align="center" prop="code"/>
-            <el-table-column label="注册证号" align="center" prop="code"/>
-            <el-table-column label="商品名" align="center" prop="code"/>
-            <el-table-column label="通用名" align="center" prop="code"/>
-            <el-table-column label="剂型" align="center" prop="code"/>
-            <el-table-column label="收货客户" align="center" prop="code"/>
-            <el-table-column label="收货地址" align="center" prop="code"/>
-            <el-table-column label="收货地区" align="center" prop="code"/>
-            <el-table-column label="收货地点" align="center" prop="code"/>
-            <el-table-column label="计划发货日期" align="center" prop="code"/>
-            <el-table-column label="计划到货日期" align="center" prop="code"/>
-            <el-table-column label="运输方式" align="center" prop="code"/>
-            <el-table-column label="备注" align="center" prop="code"/>
-            <el-table-column label="客户物料编码" align="center" prop="code"/>
-            <el-table-column label="客户物料名称" align="center" prop="code"/>
+            <el-table-column label="行号" align="center" prop="rowno"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+            <el-table-column label="产地" align="center" prop="originPlace"/>
+            <el-table-column label="类别" align="center" prop="classify"/>
+            <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
+            <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
+            <!-- <el-table-column label="收货利润中心" align="center" prop="code"/>
+            <el-table-column label="发货利润中心" align="center" prop="code"/> -->
+            <el-table-column label="调入业务员" align="center" prop="businessPersonalName"/>
+            <el-table-column label="产品批号" align="center" prop="productBatch"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
+            <el-table-column label="注册证号" align="center" prop="registration"/>
+            <el-table-column label="商品名" align="center" prop="productCode"/>
+            <el-table-column label="通用名" align="center" prop="commonCode"/>
+            <el-table-column label="剂型" align="center" prop="drug"/>
+            <el-table-column label="收货客户" align="center" prop="customerName"/>
+            <el-table-column label="收货地址" align="center" prop="addressaddress"/>
+            <el-table-column label="收货地区" align="center" prop="area"/>
+            <el-table-column label="收货地点" align="center" prop="place"/>
+            <el-table-column label="计划发货日期" align="center" prop="deliveryDate"/>
+            <el-table-column label="计划到货日期" align="center" prop="strageDate"/>
+            <el-table-column label="运输方式" align="center" prop="transportation"/>
+            <el-table-column label="备注" align="center" prop="remark"/>
+            <el-table-column label="客户物料编码" align="center" prop="customerLogistic"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
           </el-tab-pane>
 
@@ -431,31 +430,31 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="code"/>
-            <el-table-column label="调拨出库单号" align="center" prop="code"/>
-            <el-table-column label="调拨入库单号" align="center" prop="code"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
-            <el-table-column label="产地" align="center" prop="code"/>
-            <el-table-column label="类别" align="center" prop="code"/>
-            <el-table-column label="税率" align="center" prop="code"/>
-            <el-table-column label="无税单价" align="center" prop="code"/>
-            <el-table-column label="含税单价" align="center" prop="code"/>
-            <el-table-column label="产品批号" align="center" prop="code"/>
-            <el-table-column label="生产日期" align="center" prop="code"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="code"/>
-            <el-table-column label="批准文号" align="center" prop="code"/>
-            <el-table-column label="注册证号" align="center" prop="code"/>
-            <el-table-column label="商品名" align="center" prop="code"/>
-            <el-table-column label="通用名" align="center" prop="code"/>
-            <el-table-column label="剂型" align="center" prop="code"/>
-            <el-table-column label="询价无税价" align="center" prop="code"/>
-            <el-table-column label="询价含税价" align="center" prop="code"/>
-            <el-table-column label="税额" align="center" prop="code"/>
-            <el-table-column label="加价率" align="center" prop="code"/>
-            <el-table-column label="无税金额" align="center" prop="code"/>
-            <el-table-column label="价税合计" align="center" prop="code"/>
-            <el-table-column label="客户物料码" align="center" prop="code"/>
-            <el-table-column label="客户物料名称" align="center" prop="code"/>
+            <el-table-column label="行号" align="center" prop="rowno"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+            <el-table-column label="产地" align="center" prop="originPlace"/>
+            <el-table-column label="类别" align="center" prop="classify"/>
+            <!-- <el-table-column label="税率" align="center" prop="code"/> -->
+            <!-- <el-table-column label="无税单价" align="center" prop="code"/> -->
+            <!-- <el-table-column label="含税单价" align="center" prop="code"/> -->
+            <el-table-column label="产品批号" align="center" prop="productBatch"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
+            <el-table-column label="注册证号" align="center" prop="registration"/>
+            <el-table-column label="商品名" align="center" prop="productCode"/>
+            <el-table-column label="通用名" align="center" prop="commonCode"/>
+            <el-table-column label="剂型" align="center" prop="drug"/>
+            <!-- <el-table-column label="询价无税价" align="center" prop="code"/> -->
+            <!-- <el-table-column label="询价含税价" align="center" prop="code"/> -->
+            <!-- <el-table-column label="税额" align="center" prop="code"/> -->
+            <!-- <el-table-column label="加价率" align="center" prop="code"/> -->
+            <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
+            <!-- <el-table-column label="价税合计" align="center" prop="code"/> -->
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
           </el-tab-pane>
 
@@ -465,30 +464,30 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="code"/>
-            <el-table-column label="调拨出库单号" align="center" prop="code"/>
-            <el-table-column label="调拨入库单号" align="center" prop="code"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
-            <el-table-column label="产地" align="center" prop="code"/>
-            <el-table-column label="类别" align="center" prop="code"/>
-            <el-table-column label="产品批号" align="center" prop="code"/>
-            <el-table-column label="生产日期" align="center" prop="code"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="code"/>
-            <el-table-column label="批准文号" align="center" prop="code"/>
-            <el-table-column label="注册证号" align="center" prop="code"/>
-            <el-table-column label="商品名" align="center" prop="code"/>
-            <el-table-column label="通用名" align="center" prop="code"/>
-            <el-table-column label="剂型" align="center" prop="code"/>
-            <el-table-column label="已调出主数量" align="center" prop="code"/>
-            <el-table-column label="已调入主数量" align="center" prop="code"/>
-            <el-table-column label="调拨在途主数量" align="center" prop="code"/>
-            <el-table-column label="已发货主数量" align="center" prop="code"/>
-            <el-table-column label="途损主数量" align="center" prop="code"/>
-            <el-table-column label="累计退货主数量" align="center" prop="code"/>
-            <el-table-column label="调出与调入已结算主数量" align="center" prop="code"/>
-            <el-table-column label="调出与调入已结算金额" align="center" prop="code"/>
-            <el-table-column label="客户物料码" align="center" prop="code"/>
-            <el-table-column label="客户物料名称" align="center" prop="code"/>
+            <el-table-column label="行号" align="center" prop="rowno"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+            <el-table-column label="产地" align="center" prop="originPlace"/>
+            <el-table-column label="类别" align="center" prop="classify"/>
+            <el-table-column label="产品批号" align="center" prop="productBatch	"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
+            <el-table-column label="注册证号" align="center" prop="registration"/>
+            <el-table-column label="商品名" align="center" prop="productCode"/>
+            <el-table-column label="通用名" align="center" prop="commonCode"/>
+            <el-table-column label="剂型" align="center" prop="drug"/>
+            <!-- <el-table-column label="已调出主数量" align="center" prop="code"/>
+            <el-table-column label="已调入主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="调拨在途主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="已发货主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="途损主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="累计退货主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="调出与调入已结算主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="调出与调入已结算金额" align="center" prop="code"/> -->
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
           </el-tab-pane>
         </el-tabs>
@@ -509,6 +508,7 @@
 </template>
 
 <script>
+import {addOrder, getOrderDetail, editOrder} from '@/api/purchase/transferOrder.js'
 export default {
   name: 'addOder',
   props: ['pageStu','row', 'disable'],
@@ -524,7 +524,41 @@ export default {
       }, {
         value: '0', label: '否'
       }],
-      basicRules: {},
+      basicRules: {
+        billType: '',
+        code: '',
+        billDate	: '',
+        allotType: '',
+        deliveryCode: '',
+        storageCode: '',
+        storageInventoryOrg: '',
+        storageInventoryOrgName: '',
+        businessPersonal: '',
+        businessPersonalName: '',
+        deliveryDept: '',
+        deliveryDeptName: '',
+        currency: '',
+        currencyName: '',
+        rate: '',
+        onRouteAffilliation: '',
+        qty: '',
+        accountPath: '',
+        customer: '',
+        customerName: '',
+        deliveryWarehouse: '',
+        deliveryWarehouseName: '',
+        storageWarehouse: '',
+        storageWarehouseName: '',
+        materialProject: '',
+        sourceIdentification: '',
+        isSendWms: '',
+        status: '',
+        tenantId: '',
+        revision: '',
+        createByName: '',
+        updateByName: '',
+        delFlag: '',
+      },
       materialInfo: [],
       receiveInfo: [],
       priceList: [],
@@ -534,13 +568,37 @@ export default {
   created() {
     if(this.pageStu == 'check') {
       console.log('数据', this.row)
-      // this.getDetails(this.row)
+      this.getDetails(this.row)
     } else if(this.pageStu == 'edit') {
-      // this.getDetails(this.row)
+      this.getDetails(this.row)
     }
   },
   methods: {
-    save() {},
+    save() {
+      if(this.pageStu == 'add') {
+        this.basicForm.stAllotMaterialList = this.materialInfo
+        this.basicForm.stAllotReceiveDeliverList = this.receiveInfo
+        this.basicForm.stAllotReceiveExecuteList = this.priceList
+        this.basicForm.stAllotReceiveExpenseList = this.resultList
+        addOrder(this.basicForm).then(res => {
+          if (res.code === 200) {
+            this.$modal.msgSuccess("保存成功");
+            this.back()
+          }
+        })
+      } else if (this.pageStu == 'edit') {
+        this.basicForm.stAllotMaterialList = this.materialInfo
+        this.basicForm.stAllotReceiveDeliverList = this.receiveInfo
+        this.basicForm.stAllotReceiveExecuteList = this.priceList
+        this.basicForm.stAllotReceiveExpenseList = this.resultList
+        editOrder(this.basicForm).then(res => {
+          if (res.code === 200) {
+            this.$modal.msgSuccess("编辑成功");
+            this.back()
+          }
+        })
+      }
+    },
     back() {
       this.$emit('jugislist', true)
       let queryParams = {
@@ -549,6 +607,18 @@ export default {
       }
       this.$emit('refresh', queryParams)
     },
+    // 如果需要回显则调用详情接口
+    getDetails(row) {
+      getOrderDetail(row.id).then(res => {
+        if (res.code === 200) {
+          this.basicForm = res.data
+          // this.materialInfo = res.data.stAllotMaterialList
+          // this.receiveInfo = res.data.stAllotReceiveDeliverList
+          // this.priceList = res.data.stAllotReceiveExecuteList
+          // this.resultList = res.data.stAllotReceiveExpenseList
+        }
+      })
+    },
   }
 }
 </script>

src/views/purchase/transferOrder/index.vue

@@ -18,7 +18,7 @@
             <el-form-item label="单据日期">
               <el-date-picker
                style="width: 240px"
-                v-model="queryParams.djrq"
+                v-model="queryParams.billDate"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始日期"
@@ -73,7 +73,7 @@
             <el-col :span="1.5">
               <el-form-item label="调入库存组织">
                 <el-input
-                v-model="queryParams.drkuzz"
+                v-model="queryParams.storageInventoryOrg"
                 size="small"
                 placeholder=""
                 clearable
@@ -99,23 +99,23 @@
           max-height="680"
         >
           <el-table-column label="调出库存" align="center" prop="code"/>
-          <el-table-column label="订单类型" align="center" prop="code"/>
+          <el-table-column label="订单类型" align="center" prop="billType"/>
           <el-table-column label="单据号" align="center" prop="code"/>
-          <el-table-column label="单据日期" align="center" prop="code"/>
-          <el-table-column label="调拨方式" align="center" prop="code"/>
-          <el-table-column label="调拨出库单号" align="center" prop="code"/>
-          <el-table-column label="调拨入库单号" align="center" prop="code"/>
-          <el-table-column label="调拨入库组织" align="center" prop="code"/>
-          <el-table-column label="调出业务员" align="center" prop="code"/>
-          <el-table-column label="调出部门" align="center" prop="code"/>
-          <el-table-column label="币种" align="center" prop="code"/>
-          <el-table-column label="折本汇率" align="center" prop="code"/>
-          <el-table-column label="在途归属" align="center" prop="code"/>
-          <el-table-column label="总数量" align="center" prop="code"/>
-          <el-table-column label="结算路径" align="center" prop="code"/>
-          <el-table-column label="客户" align="center" prop="code"/>
-          <el-table-column label="调出仓库" align="center" prop="code"/>
-          <el-table-column label="调入仓库" align="center" prop="code"/>
+          <el-table-column label="单据日期" align="center" prop="billDate"/>
+          <el-table-column label="调拨方式" align="center" prop="allotType"/>
+          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
+          <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+          <el-table-column label="调拨入库组织" align="center" prop="storageInventoryOrgName"/>
+          <el-table-column label="调出业务员" align="center" prop="businessPersonalName"/>
+          <el-table-column label="调出部门" align="center" prop="deliveryDeptName"/>
+          <el-table-column label="币种" align="center" prop="currencyName"/>
+          <el-table-column label="折本汇率" align="center" prop="rate"/>
+          <el-table-column label="在途归属" align="center" prop="onRouteAffilliation"/>
+          <el-table-column label="总数量" align="center" prop="qty"/>
+          <el-table-column label="结算路径" align="center" prop="accountPath"/>
+          <el-table-column label="客户" align="center" prop="customerName"/>
+          <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
+          <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
           <el-table-column label="物流项目组" align="center" prop="code"/>
           <el-table-column label="利润中心" align="center" prop="code"/>
           <el-table-column label="已同步WMS" align="center" prop="code"/>
@@ -129,6 +129,18 @@
           <el-table-column label="创建时间" align="center" prop="code"/>
           <el-table-column label="最后修改人" align="center" prop="code"/>
           <el-table-column label="最后修改时间" align="center" prop="code"/>
+          <el-table-column
+          fixed="right"
+          label="操作"
+          align="center"
+          width="150"
+          >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="check(scope.row)">查看</el-button>
+            <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click="deleteids(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
         </el-table>
         <el-pagination
           @size-change="handleSizeChange"
@@ -147,41 +159,40 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="code"/>
-            <el-table-column label="物料编码" align="center" prop="code"/>
-            <el-table-column label="物料名称" align="center" prop="code"/>
+            <el-table-column label="行号" align="center" prop="rowno"/>
+            <el-table-column label="物料编码" align="center" prop="material"/>
+            <el-table-column label="物料名称" align="center" prop="materialName"/>
             <el-table-column label="调拨出库单号" align="center" prop="code"/>
             <el-table-column label="调拨入库单号" align="center" prop="code"/>
             <el-table-column label="规格" align="center" prop="code"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
-            <el-table-column label="产地" align="center" prop="code"/>
-            <el-table-column label="型号" align="center" prop="code"/>
-            <el-table-column label="类别" align="center" prop="code"/>
-            <el-table-column label="单位" align="center" prop="code"/>
-            <el-table-column label="调出仓库" align="center" prop="code"/>
-            <el-table-column label="数量" align="center" prop="code"/>
-            <el-table-column label="主单位" align="center" prop="code"/>
-            <el-table-column label="换算率" align="center" prop="code"/>
-            <el-table-column label="主数量" align="center" prop="code"/>
-            <el-table-column label="税率" align="center" prop="code"/>
-            <el-table-column label="调入仓库" align="center" prop="code"/>
-            <el-table-column label="批次号" align="center" prop="code"/>
-            <el-table-column label="产品批号" align="center" prop="code"/>
-            <el-table-column label="生产日期" align="center" prop="code"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="code"/>
-            <el-table-column label="批准文号" align="center" prop="code"/>
-            <el-table-column label="注册证号" align="center" prop="code"/>
-            <el-table-column label="商品名" align="center" prop="code"/>
-            <el-table-column label="通用名" align="center" prop="code"/>
-            <el-table-column label="剂型" align="center" prop="code"/>
-            <el-table-column label="调入调出结算规则明细" align="center" prop="code"/>
-            <el-table-column label="上市许可持有人" align="center" prop="code"/>
-            <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="code"/>
-            <el-table-column label="pi码" align="center" prop="code"/>
-            <el-table-column label="无税金额" align="center" prop="code"/>
-            <el-table-column label="备注" align="center" prop="code"/>
-            <el-table-column label="客户物料码" align="center" prop="code"/>
-            <el-table-column label="客户物料名称" align="center" prop="code"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+            <el-table-column label="产地" align="center" prop="originPlace"/>
+            <el-table-column label="型号" align="center" prop="model"/>
+            <el-table-column label="单位" align="center" prop="unit"/>
+            <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
+            <el-table-column label="数量" align="center" prop="qty"/>
+            <el-table-column label="主单位" align="center" prop="mainUnit"/>
+            <el-table-column label="换算率" align="center" prop="equation"/>
+            <el-table-column label="主数量" align="center" prop="mainQty"/>
+            <el-table-column label="税率" align="center" prop="rate"/>
+            <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
+            <el-table-column label="批次号" align="center" prop="patchNo"/>
+            <el-table-column label="产品批号" align="center" prop="producBatch"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
+            <el-table-column label="注册证号" align="center" prop="registration"/>
+            <el-table-column label="商品名" align="center" prop="productCode"/>
+            <el-table-column label="通用名" align="center" prop="commonCode"/>
+            <el-table-column label="剂型" align="center" prop="drug"/>
+            <el-table-column label="调入调出结算规则明细" align="center" prop="ruleDetail"/>
+            <el-table-column label="上市许可持有人" align="center" prop="marketingApprovalPersonal"/>
+            <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production"/>
+            <el-table-column label="pi码" align="center" prop="pi"/>
+            <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
+            <!-- <el-table-column label="备注" align="center" prop="code"/> -->
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
           </el-tab-pane>
 
@@ -191,35 +202,35 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="code"/>
-            <el-table-column label="调拨出库单号" align="center" prop="code"/>
-            <el-table-column label="调拨入库单号" align="center" prop="code"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
-            <el-table-column label="产地" align="center" prop="code"/>
-            <el-table-column label="类别" align="center" prop="code"/>
-            <el-table-column label="调出仓库" align="center" prop="code"/>
-            <el-table-column label="调入仓库" align="center" prop="code"/>
-            <el-table-column label="收货利润中心" align="center" prop="code"/>
-            <el-table-column label="发货利润中心" align="center" prop="code"/>
-            <el-table-column label="调入业务员" align="center" prop="code"/>
-            <el-table-column label="产品批号" align="center" prop="code"/>
-            <el-table-column label="生产日期" align="center" prop="code"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="code"/>
-            <el-table-column label="批准文号" align="center" prop="code"/>
-            <el-table-column label="注册证号" align="center" prop="code"/>
-            <el-table-column label="商品名" align="center" prop="code"/>
-            <el-table-column label="通用名" align="center" prop="code"/>
-            <el-table-column label="剂型" align="center" prop="code"/>
-            <el-table-column label="收货客户" align="center" prop="code"/>
-            <el-table-column label="收货地址" align="center" prop="code"/>
-            <el-table-column label="收货地区" align="center" prop="code"/>
-            <el-table-column label="收货地点" align="center" prop="code"/>
-            <el-table-column label="计划发货日期" align="center" prop="code"/>
-            <el-table-column label="计划到货日期" align="center" prop="code"/>
-            <el-table-column label="运输方式" align="center" prop="code"/>
-            <el-table-column label="备注" align="center" prop="code"/>
-            <el-table-column label="客户物料编码" align="center" prop="code"/>
-            <el-table-column label="客户物料名称" align="center" prop="code"/>
+            <el-table-column label="行号" align="center" prop="rowno"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+            <el-table-column label="产地" align="center" prop="originPlace"/>
+            <el-table-column label="类别" align="center" prop="classify"/>
+            <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
+            <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
+            <!-- <el-table-column label="收货利润中心" align="center" prop="code"/>
+            <el-table-column label="发货利润中心" align="center" prop="code"/> -->
+            <el-table-column label="调入业务员" align="center" prop="businessPersonalName"/>
+            <el-table-column label="产品批号" align="center" prop="productBatch"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
+            <el-table-column label="注册证号" align="center" prop="registration"/>
+            <el-table-column label="商品名" align="center" prop="productCode"/>
+            <el-table-column label="通用名" align="center" prop="commonCode"/>
+            <el-table-column label="剂型" align="center" prop="drug"/>
+            <el-table-column label="收货客户" align="center" prop="customerName"/>
+            <el-table-column label="收货地址" align="center" prop="addressaddress"/>
+            <el-table-column label="收货地区" align="center" prop="area"/>
+            <el-table-column label="收货地点" align="center" prop="place"/>
+            <el-table-column label="计划发货日期" align="center" prop="deliveryDate"/>
+            <el-table-column label="计划到货日期" align="center" prop="strageDate"/>
+            <el-table-column label="运输方式" align="center" prop="transportation"/>
+            <el-table-column label="备注" align="center" prop="remark"/>
+            <el-table-column label="客户物料编码" align="center" prop="customerLogistic"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
           </el-tab-pane>
 
@@ -229,31 +240,31 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="code"/>
-            <el-table-column label="调拨出库单号" align="center" prop="code"/>
-            <el-table-column label="调拨入库单号" align="center" prop="code"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
-            <el-table-column label="产地" align="center" prop="code"/>
-            <el-table-column label="类别" align="center" prop="code"/>
-            <el-table-column label="税率" align="center" prop="code"/>
-            <el-table-column label="无税单价" align="center" prop="code"/>
-            <el-table-column label="含税单价" align="center" prop="code"/>
-            <el-table-column label="产品批号" align="center" prop="code"/>
-            <el-table-column label="生产日期" align="center" prop="code"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="code"/>
-            <el-table-column label="批准文号" align="center" prop="code"/>
-            <el-table-column label="注册证号" align="center" prop="code"/>
-            <el-table-column label="商品名" align="center" prop="code"/>
-            <el-table-column label="通用名" align="center" prop="code"/>
-            <el-table-column label="剂型" align="center" prop="code"/>
-            <el-table-column label="询价无税价" align="center" prop="code"/>
-            <el-table-column label="询价含税价" align="center" prop="code"/>
-            <el-table-column label="税额" align="center" prop="code"/>
-            <el-table-column label="加价率" align="center" prop="code"/>
-            <el-table-column label="无税金额" align="center" prop="code"/>
-            <el-table-column label="价税合计" align="center" prop="code"/>
-            <el-table-column label="客户物料码" align="center" prop="code"/>
-            <el-table-column label="客户物料名称" align="center" prop="code"/>
+            <el-table-column label="行号" align="center" prop="rowno"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+            <el-table-column label="产地" align="center" prop="originPlace"/>
+            <el-table-column label="类别" align="center" prop="classify"/>
+            <!-- <el-table-column label="税率" align="center" prop="code"/> -->
+            <!-- <el-table-column label="无税单价" align="center" prop="code"/> -->
+            <!-- <el-table-column label="含税单价" align="center" prop="code"/> -->
+            <el-table-column label="产品批号" align="center" prop="productBatch"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
+            <el-table-column label="注册证号" align="center" prop="registration"/>
+            <el-table-column label="商品名" align="center" prop="productCode"/>
+            <el-table-column label="通用名" align="center" prop="commonCode"/>
+            <el-table-column label="剂型" align="center" prop="drug"/>
+            <!-- <el-table-column label="询价无税价" align="center" prop="code"/> -->
+            <!-- <el-table-column label="询价含税价" align="center" prop="code"/> -->
+            <!-- <el-table-column label="税额" align="center" prop="code"/> -->
+            <!-- <el-table-column label="加价率" align="center" prop="code"/> -->
+            <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
+            <!-- <el-table-column label="价税合计" align="center" prop="code"/> -->
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
           </el-tab-pane>
 
@@ -263,30 +274,30 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="code"/>
-            <el-table-column label="调拨出库单号" align="center" prop="code"/>
-            <el-table-column label="调拨入库单号" align="center" prop="code"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
-            <el-table-column label="产地" align="center" prop="code"/>
-            <el-table-column label="类别" align="center" prop="code"/>
-            <el-table-column label="产品批号" align="center" prop="code"/>
-            <el-table-column label="生产日期" align="center" prop="code"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="code"/>
-            <el-table-column label="批准文号" align="center" prop="code"/>
-            <el-table-column label="注册证号" align="center" prop="code"/>
-            <el-table-column label="商品名" align="center" prop="code"/>
-            <el-table-column label="通用名" align="center" prop="code"/>
-            <el-table-column label="剂型" align="center" prop="code"/>
-            <el-table-column label="已调出主数量" align="center" prop="code"/>
-            <el-table-column label="已调入主数量" align="center" prop="code"/>
-            <el-table-column label="调拨在途主数量" align="center" prop="code"/>
-            <el-table-column label="已发货主数量" align="center" prop="code"/>
-            <el-table-column label="途损主数量" align="center" prop="code"/>
-            <el-table-column label="累计退货主数量" align="center" prop="code"/>
-            <el-table-column label="调出与调入已结算主数量" align="center" prop="code"/>
-            <el-table-column label="调出与调入已结算金额" align="center" prop="code"/>
-            <el-table-column label="客户物料码" align="center" prop="code"/>
-            <el-table-column label="客户物料名称" align="center" prop="code"/>
+            <el-table-column label="行号" align="center" prop="rowno"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+            <el-table-column label="产地" align="center" prop="originPlace"/>
+            <el-table-column label="类别" align="center" prop="classify"/>
+            <el-table-column label="产品批号" align="center" prop="productBatch	"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
+            <el-table-column label="注册证号" align="center" prop="registration"/>
+            <el-table-column label="商品名" align="center" prop="productCode"/>
+            <el-table-column label="通用名" align="center" prop="commonCode"/>
+            <el-table-column label="剂型" align="center" prop="drug"/>
+            <!-- <el-table-column label="已调出主数量" align="center" prop="code"/>
+            <el-table-column label="已调入主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="调拨在途主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="已发货主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="途损主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="累计退货主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="调出与调入已结算主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column label="调出与调入已结算金额" align="center" prop="code"/> -->
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
           </el-tab-pane>
         </el-tabs>
@@ -300,6 +311,7 @@
 <script>
 import Add from './add.vue'
 import CollapseTransition from '@/components/MyCollapse/collapse.vue'
+import {getOrderList, delOrder} from '@/api/purchase/transferOrder.js'
 export default {
   name: 'transferOrder',
   components: {
@@ -315,11 +327,11 @@ export default {
       page: '',
       queryParams: {
         dckczz: '',
-        djrq: '',
+        billDate: '',
         jylx: '',
         chkczz: '',
         code: '',
-        drkuzz: '',
+        storageInventoryOrg: '',
         pageNum: 1,
         pageSize: 10
       },
@@ -339,20 +351,47 @@ export default {
       ids: []
     }
   },
+  created() {
+    this.getList(this.queryParams)
+  },
   methods: {
     getList(params){
-      // getDemandList(params).then(res => {
-      //   if (res.code === 200) {
-      //     this.tableList = res.rows
-      //     this.total = res.total
-      //   }
-      // })
+      getOrderList(params).then(res => {
+        if (res.code === 200) {
+          this.tableList = res.rows
+          this.total = res.total
+        }
+      })
     },
     addOrder() {
       this.isList = false
       this.page = 'add'
       this.disable = false
     },
+    check(row) {
+      this.isList = false
+      this.page = 'check'
+      this.rowDetail = row
+      this.disable = true
+    },
+    edit(row) {
+      this.isList = false
+      this.page = 'edit'
+      this.rowDetail = row
+      this.disable = false
+    },
+    // 行内删除
+    deleteids(row) {
+      console.log('row', row)
+      this.$modal.confirm('确认信息').then(() => {
+        delOrder(row.id).then(res => {
+          if (res.code === 200) {
+            this.$modal.msgSuccess("删除成功");
+            this.getList(this.queryParams)
+          }
+        })
+        }).catch(() => {})
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.queryParams.pageSize = val