Merge branch 'dev_pu_ownership' into dev

# Conflicts:
#	src/views/purchase/PurchaseDemandList/add.vue
#	src/views/purchase/transferOrder/reserved.vue

src/api/purchase/ownership.js

@@ -24,4 +24,12 @@ export function update(data) {
     method: 'put',
     data: data
   })
+}
+
+// 货权预留单详情
+export function getDetailBySource(id) {
+  return request({
+    url: `/pu/ownership/detail/${id}`,
+    method: 'get',
+  })
 }

src/api/purchase/ownershipClose.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/pu/ownershipClose/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 详细
+export function detail(id) {
+  return request({
+    url: '/pu/ownershipClose/' + id,
+    method: 'get'
+  })
+}
+
+// 新增
+export function insert(data) {
+  return request({
+    url: '/pu/ownershipClose',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function update(data) {
+  return request({
+    url: '/pu/ownershipClose',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function del(id) {
+  return request({
+    url: '/pu/ownershipClose/' + id,
+    method: 'delete'
+  })
+}
+
+// 物料一级分类列表
+export function oneClassList() {
+  return request({
+    url: '/pu/ownershipClose/oneClassList',
+    method: 'get',
+  })
+}
+

src/api/purchase/ownershipCp.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/pu/ownershipCp/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 详细
+export function detail(id) {
+  return request({
+    url: '/pu/ownershipCp/' + id,
+    method: 'get'
+  })
+}
+
+// 新增
+export function insert(data) {
+  return request({
+    url: '/pu/ownershipCp',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function update(data) {
+  return request({
+    url: '/pu/ownershipCp',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function del(id) {
+  return request({
+    url: '/pu/ownershipCp/' + id,
+    method: 'delete'
+  })
+}
+

src/api/purchase/ownershipLot.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/pu/ownershipLot/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 详细
+export function detail(id) {
+  return request({
+    url: '/pu/ownershipLot/' + id,
+    method: 'get'
+  })
+}
+
+// 新增
+export function insert(data) {
+  return request({
+    url: '/pu/ownershipLot',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function update(data) {
+  return request({
+    url: '/pu/ownershipLot',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function del(id) {
+  return request({
+    url: '/pu/ownershipLot/' + id,
+    method: 'delete'
+  })
+}
+

src/api/purchase/transferOrder.js

@@ -54,13 +54,6 @@ export function againToNC(data) {
     data: data
   })
 }
-// 货权预留单详情
-export function getResevedDetail(id) {
-  return request({
-    url: `/pu/ownership/detail/${id}`,
-    method: 'get',
-  })
-}
 
 // 查询调拨物料明细列表
 export function listStAllotItem(pid) {

src/views/business/ehr/pm/adjustMark/index.vue

@@ -197,6 +197,7 @@ export default {
           this.adjustlogForm.performanceId = this.form.id;
           addAdjustlog(this.adjustlogForm).then(response => {
             this.$modal.msgSuccess("保存成功");
+            this.adjustlogForm = {};
             this.formOpen = false;
             this.getList();
           });

src/views/purchase/PurchaseDemandList/reserved.vue

@@ -5,92 +5,78 @@
       :before-close="handleClose"
       width="70%"
     >
-    <el-descriptions class="margin-top" title="货权预留单" :column="3" size="small" border>
-      <el-descriptions-item>
-        <template slot="label">
-          预留单据号
-        </template>
-        {{ resData.code }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          来源单据号
-        </template>
-        {{ resData.source }}
-      </el-descriptions-item>
-      <!-- <el-descriptions-item>
-        <template slot="label">
-          客户
-        </template>
-        {{ resData.customer }}
-      </el-descriptions-item> -->
-      <el-descriptions-item>
-        <template slot="label">
-          客户名称
-        </template>
-        {{ resData.customerName }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          创建人
-        </template>
-        {{ resData.createBy }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          创建人名称
-        </template>
-        {{ resData.createByName }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          创建时间
-        </template>
-        {{ resData.createTime }}
-      </el-descriptions-item>
-    </el-descriptions>
-    
-      <el-table style="margin-top: 50px" :data="tableList2">
+      <el-descriptions class="margin-top" title="货权预留单" :column="3" size="small" border>
+        <el-descriptions-item>
+          <template slot="label">
+            预留单据号
+          </template>
+          {{ resData.code }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            来源单据号
+          </template>
+          {{ resData.source }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            客户名称
+          </template>
+          {{ resData.customerName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            创建人
+          </template>
+          {{ resData.createByName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            创建人编码
+          </template>
+          {{ resData.createBy }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            创建时间
+          </template>
+          {{ resData.createTime }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-table style="margin-top: 50px" :data="items" @row-click="rowClick" height="300px">
         <el-table-column show-overflow-tooltip prop="materialCode" label="物料编码" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="materialName" label="物料名称" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="unit" label="单位" width="150"></el-table-column> -->
         <el-table-column show-overflow-tooltip prop="unitName" label="单位名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="reservedQty" label="预留数量" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="reservedProportion" label="预留比例" width="150"></el-table-column> -->
-        <el-table-column show-overflow-tooltip prop="reservedPeriod" label="预留周期" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="warehouse" label="仓库" width="150"></el-table-column> -->
-        <el-table-column show-overflow-tooltip prop="warehouseName" label="仓库名称" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="allocation" label="货位" width="150"></el-table-column> -->
-        <el-table-column show-overflow-tooltip prop="allocationName" label="货位名称" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="totalIn" label="累计入库数量" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="qty" label="可用量" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="usedQty" label="已用量" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="warehouseName" label="仓库名称" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="allocationName" label="货位名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="createTime" label="创建时间" width="200"></el-table-column>
       </el-table>
-      <el-table style="margin-top: 50px" :data="tableList3">
+      <el-table style="margin-top: 50px" :data="showHistoryItems" height="300px">
         <el-table-column show-overflow-tooltip prop="materialCode" label="物料编码" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="materialName" label="物料名称" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="unit" label="单位" width="150"></el-table-column> -->
         <el-table-column show-overflow-tooltip prop="unitName" label="单位名称" width="150"></el-table-column>
-        <el-table-column show-overflow-tooltip prop="reservedQty" label="预留数量" width="150"></el-table-column>
-        <el-table-column show-overflow-tooltip prop="allotQty" label="操作数量" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="reservedProportion" label="预留比例" width="150"></el-table-column> -->
-        <el-table-column show-overflow-tooltip prop="reservedPeriod" label="预留周期" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="deliveryWarehouse" label="调出仓库" width="150"></el-table-column> -->
-        <el-table-column show-overflow-tooltip prop="deliveryWarehouseName" label="调出仓库名称" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="deliveryAllocation" label="调出货位" width="150"></el-table-column> -->
-        <el-table-column show-overflow-tooltip prop="deliveryAllocationName" label="调出货位名称" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="storageWarehouse" label="调入仓库" width="150"></el-table-column> -->
-        <el-table-column show-overflow-tooltip prop="storageWarehouseName" label="调入仓库名称" width="150"></el-table-column>
-        <!-- <el-table-column show-overflow-tooltip prop="storageAllocation" label="调入货位" width="150"></el-table-column> -->
-        <el-table-column show-overflow-tooltip prop="storageAllocationName" label="调入货位名称" width="150"></el-table-column>
-        <el-table-column show-overflow-tooltip prop="createTime" label="创建时间" width="200"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateType" label="操作类型" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateBill" label="操作单据" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateBillcode" label="操作单据编码" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateBillitem" label="操作明细行" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="allotQty" label="操作数量" width="150">
+          <template slot-scope="scope">
+            {{scope.row.allotQty > 0 ? "+" + scope.row.allotQty : scope.row.allotQty}}
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="createTime" label="操作时间" width="200"></el-table-column>
       </el-table>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {getResevedDetail} from '@/api/purchase/transferOrder.js'
+import {getDetailBySource} from '@/api/purchase/ownership.js'
+
 export default {
   props: {
     isVisible: {
@@ -103,31 +89,33 @@ export default {
     }
   },
   mounted() {
-    console.log('出现')
-    console.log(this.info)
     this.getDetails(this.info)
   },
   data() {
     return {
       visible:this.isVisible,
       resData: {},
-      tableList2: [],
-      tableList3: [],
+      items: [],
+      historyItems: [],
+      showHistoryItems: [],
     }
   },
   methods: {
     getDetails(row) {
-      getResevedDetail(row.code).then(res => {
+      getDetailBySource(row.code).then(res => {
         if (res.code === 200) {
-          this.resData = res.data
-          this.tableList2 = res.data.stMaterialOwnershipItemList
-          this.tableList3 = res.data.stMaterialOwnershipHistoryList
+          this.resData = res.data;
+          this.items = res.data.stMaterialOwnershipItemList;
+          this.historyItems = res.data.stMaterialOwnershipHistoryList;
+          this.showHistoryItems = this.historyItems.filter(ele => ele.ownerId == this.items[0].id);
         }
       })
     },
     handleClose() {
-      console.log('调用')
       this.$emit('updateReserved', false)
+    },
+    rowClick(row){
+      this.showHistoryItems = this.historyItems.filter(ele => ele.ownerId == row.id);
     }
   }
 }

src/views/purchase/ownership/index.vue

@@ -1,45 +1,51 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
-      <el-form-item label="来源单据">
-        <el-input
-          v-model="queryParams.source"
-          clearable
-          @keyup.enter.native="btnQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户">
-        <DrPopoverSelectV2
-          size="mini"
-          v-model="queryParams.customerName"
-          valueKey= "name"
-          referName="CUSTOMER_PARAM"
-          :dataMapping="{
-            customer: 'id',
-            customerName: 'name',
-          }"
-          :source.sync="queryParams"
-        >
-        </DrPopoverSelectV2>
-      </el-form-item>
-      <el-form-item label="物料">
-        <DrPopoverSelectV2
-          size="mini"
-          v-model="queryParams.materialName"
-          valueKey= "name"
-          referName="MATERIAL_PARAM"
-          :dataMapping="{
-            material: 'id',
-            materialName: 'name',
-          }"
-          :source.sync="queryParams"
-        >
-        </DrPopoverSelectV2>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="btnQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
-      </el-form-item>
+      <el-row >
+        <el-col :span="18">
+          <el-form-item label="来源单据">
+            <el-input
+              v-model="queryParams.source"
+              clearable
+              @keyup.enter.native="btnQuery"
+            />
+          </el-form-item>
+          <el-form-item label="客户">
+            <DrPopoverSelectV2
+              size="mini"
+              v-model="queryParams.customerName"
+              valueKey= "name"
+              referName="CUSTOMER_PARAM"
+              :dataMapping="{
+                customer: 'id',
+                customerName: 'name',
+              }"
+              :source.sync="queryParams"
+            >
+            </DrPopoverSelectV2>
+          </el-form-item>
+          <el-form-item label="物料">
+            <DrPopoverSelectV2
+              size="mini"
+              v-model="queryParams.materialName"
+              valueKey= "name"
+              referName="MATERIAL_PARAM"
+              :dataMapping="{
+                material: 'id',
+                materialName: 'name',
+              }"
+              :source.sync="queryParams"
+            >
+            </DrPopoverSelectV2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item style="float:right">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="btnQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-table
@@ -97,36 +103,15 @@
         :model="form"
         label-width="80px"
       >
-        <el-form-item label="单据来源">
-          <el-input
-            v-model="form.source"
-            readonly
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-input
-            v-model="form.createTime"
-            readonly
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="客户">
-          <el-input
-            v-model="form.customerName"
-            readonly
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="物料编码">
-          <el-input
-            v-model="form.materialCode"
-            readonly
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="物料">
-          <el-input
-            v-model="form.materialName"
-            readonly
-          ></el-input>
-        </el-form-item>
+        <el-descriptions :column="1">
+          <el-descriptions-item label="单据来源">{{form.source}}</el-descriptions-item>
+          <el-descriptions-item label="创建时间">{{form.createTime}}</el-descriptions-item>
+          <el-descriptions-item label="客户">{{form.customerName}}</el-descriptions-item>
+          <el-descriptions-item label="物料编码">{{form.materialCode}}</el-descriptions-item>
+          <el-descriptions-item label="物料" span="2">{{form.materialName}}</el-descriptions-item>
+          <el-descriptions-item label="已用量">{{form.usedQty}}</el-descriptions-item>
+          <el-descriptions-item label="预留数量">{{form.reservedQty}}</el-descriptions-item>
+        </el-descriptions>
         <el-form-item label="可用量">
           <el-input
             type="number"
@@ -136,18 +121,6 @@
             @input='useFormQtyChange'
           />
         </el-form-item>
-        <el-form-item label="已用量">
-          <el-input
-            v-model="form.usedQty"
-            readonly
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="预留数量">
-          <el-input
-            v-model="form.reservedQty"
-            readonly
-          ></el-input>
-        </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button

src/views/purchase/ownershipClose/index.vue

@@ -0,0 +1,263 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
+      <el-row >
+        <el-col :span="18">
+          <el-form-item label="一级分类">
+            <el-select
+              size="mini"
+              v-model="queryParams.oneClass"
+              placeholder=""
+              clearable
+            >
+              <el-option
+                v-for="dict in oneClass"
+                :key="dict.id"
+                :label="dict.materialType"
+                :value="dict.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item  style="float:right">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="btnQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="float:right">
+        <el-button type="primary" size="mini" @click="btnAdd">新增</el-button>
+      </div>
+    <el-table
+      size="mini"
+      v-loading="loading"
+      :data="list"
+      height="500px"
+    >
+      <el-table-column show-overflow-tooltip width="200" label="序号" align="center" prop="id" />
+      <el-table-column show-overflow-tooltip width="200" label="一级分类名称" align="center" prop="oneClassName" />
+      <el-table-column show-overflow-tooltip width="200" label="一级分类编码" align="center" prop="oneClassCode" />
+      <el-table-column show-overflow-tooltip width="200" label="释放天数" align="center" prop="day" />
+      <el-table-column
+        width="250"
+        label="操作"
+        fixed="right"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="btnUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" @click="btnDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="paginationClass">
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+    <!-- 添加或修改任务对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+      :show-close="false"
+    >
+      <el-form
+        size="mini"
+        ref="form"
+        :model="form"
+        label-width="80px"
+      >
+        <el-form-item label="一级分类">
+          <el-select
+          size="mini"
+          v-model="form.oneClass"
+          placeholder=""
+          clearable
+          @change="change"
+        >
+          <el-option
+            v-for="dict in oneClass"
+            :key="dict.id"
+            :label="dict.materialType"
+            :value="dict.id"
+          ></el-option>
+        </el-select>
+        </el-form-item>
+        <el-form-item label="天数">
+          <el-col :span="8">
+            <el-input type="number" oninput="value=value.replace(/[^0-9.]/g,'')" v-model="form.day"></el-input>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button
+          size="mini"
+          type="primary"
+          @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button size="mini" @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+
+<script>
+import {list,detail,insert,update,del,oneClassList} from '@/api/purchase/ownershipClose.js'
+
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 列表数据
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        oneClass: null,
+      },
+      // 表单参数
+      form: {
+      },
+      //一级分类列表
+      oneClass:[],
+    };
+  },
+  async created() {
+    await this.getList();
+    let res = await oneClassList();
+    this.oneClass = res.rows;
+  },
+  methods: {
+    /** 查询任务列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.form = {};
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        oneClass: null,
+        oneClassCode: null,
+        oneClassName: null,
+        day: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    btnQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    btnResetQuery() {
+      // this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        oneClass: null
+      };
+      this.btnQuery();
+    },
+    /** 修改按钮操作 */
+    btnUpdate(row) {
+      this.reset();
+      const id = row.id;
+      detail(id).then(response => {
+        this.form = {...this.form,...response.data};
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交表单 */
+    submitForm() {
+      if(this.form.id){
+        update(this.form).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.form = {};
+          this.getList();
+        });
+      }else{
+        insert(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.form = {};
+          this.getList();
+        });
+      }
+    },
+    btnAdd(){
+      this.open = true;
+      this.title = "新增";
+    },
+    change(val){
+      let arr = this.oneClass.filter(o => o.id == val);
+      console.log('arr',arr);
+      this.form.oneClassCode = arr[0].code;
+      this.form.oneClassName = arr[0].materialType;
+    },
+    btnDelete(row){
+      this.$modal.confirm('是否确认删除"' + row.oneClassName + '"数据？').then(function() {
+        return del(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

src/views/purchase/ownershipCp/index.vue

@@ -0,0 +1,256 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
+      <el-row >
+        <el-col :span="18">
+          <el-form-item label="编码">
+            <el-input v-model="queryParams.code"></el-input>
+          </el-form-item>
+          <el-form-item label="物料">
+            <el-input v-model="queryParams.params.materialNameOrCode"></el-input>
+          </el-form-item>
+          <el-form-item label="客户">
+            <el-input v-model="queryParams.params.customerNameOrCode"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item  style="float:right">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="btnQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="float:right">
+        <el-button type="primary" size="mini" @click="btnAdd">新增</el-button>
+      </div>
+    <el-table
+      size="mini"
+      v-loading="loading"
+      :data="list"
+      height="500px"
+    >
+      <el-table-column show-overflow-tooltip width="200" label="序号" align="center" prop="id" />
+      <el-table-column show-overflow-tooltip width="200" label="编码" align="center" prop="code" />
+      <el-table-column show-overflow-tooltip width="200" label="物料" align="center" prop="materialName" />
+      <el-table-column show-overflow-tooltip width="200" label="物料编码" align="center" prop="materialCode" />
+      <el-table-column show-overflow-tooltip width="200" label="客户" align="center" prop="customerName" />
+      <el-table-column show-overflow-tooltip width="200" label="客户编码" align="center" prop="customerCode" />
+      <el-table-column
+        width="250"
+        label="操作"
+        fixed="right"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="btnUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" @click="btnDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="paginationClass">
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+    <!-- 添加或修改任务对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+      :show-close="false"
+    >
+      <el-form
+        size="mini"
+        ref="form"
+        :model="form"
+        label-width="80px"
+      >
+        <el-form-item label="编码">
+          <el-col :span="8">
+            <el-input v-model="form.code"></el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="物料">
+          <DrPopoverSelectV2
+            size="mini"
+            v-model="form.materialName"
+            valueKey= "name"
+            referName="MATERIAL_PARAM"
+            :dataMapping="{
+              material: 'id',
+              materialCode: 'code',
+            }"
+            :source.sync="form"
+          >
+          </DrPopoverSelectV2>
+        </el-form-item>
+        <el-form-item label="客户">
+          <DrPopoverSelectV2
+            size="mini"
+            v-model="form.customerName"
+            valueKey= "name"
+            referName="CUSTOMER_PARAM"
+            :dataMapping="{
+              customer: 'id',
+              customerCode: 'code',
+            }"
+            :source.sync="form"
+          >
+          </DrPopoverSelectV2>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button
+          size="mini"
+          type="primary"
+          @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button size="mini" @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+
+<script>
+import {list,detail,insert,update,del} from '@/api/purchase/ownershipCp.js'
+
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 列表数据
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        params:{
+          materialNameOrCode: null,
+          customerNameOrCode: null,
+        },
+      },
+      // 表单参数
+      form: {
+      },
+    };
+  },
+  async created() {
+    await this.getList();
+  },
+  methods: {
+    /** 查询任务列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.form = {};
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    btnQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    btnResetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        params:{
+          materialNameOrCode: null,
+          customerNameOrCode: null,
+        },
+      };
+      this.btnQuery();
+    },
+    /** 修改按钮操作 */
+    btnUpdate(row) {
+      const id = row.id;
+      detail(id).then(response => {
+        this.form = {...this.form,...response.data};
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交表单 */
+    submitForm() {
+      if(this.form.id){
+        update(this.form).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.form = {};
+          this.getList();
+        });
+      }else{
+        insert(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.form = {};
+          this.getList();
+        });
+      }
+    },
+    btnAdd(){
+      this.open = true;
+      this.title = "新增";
+    },
+    btnDelete(row){
+      this.$modal.confirm('是否确认删除"' + row.code + "+" + row.materialName + "+" + row.customerName + '"数据？').then(function() {
+        return del(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

src/views/purchase/ownershipLot/index.vue

@@ -0,0 +1,247 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
+      <el-row >
+        <el-col :span="18">
+          <el-form-item label="物料">
+            <el-input v-model="queryParams.params.materialNameOrCode"></el-input>
+          </el-form-item>
+          <el-form-item label="客户">
+            <el-input v-model="queryParams.params.customerNameOrCode"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item  style="float:right">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="btnQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="float:right">
+        <el-button type="primary" size="mini" @click="btnAdd">新增</el-button>
+      </div>
+    <el-table
+      size="mini"
+      v-loading="loading"
+      :data="list"
+      height="500px"
+    >
+      <el-table-column show-overflow-tooltip width="200" label="序号" align="center" prop="id" />
+      <el-table-column show-overflow-tooltip width="200" label="物料" align="center" prop="materialName" />
+      <el-table-column show-overflow-tooltip width="200" label="物料编码" align="center" prop="materialCode" />
+      <el-table-column show-overflow-tooltip width="200" label="客户" align="center" prop="customerName" />
+      <el-table-column show-overflow-tooltip width="200" label="客户编码" align="center" prop="customerCode" />
+      <el-table-column
+        width="250"
+        label="操作"
+        fixed="right"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="btnUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" @click="btnDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="paginationClass">
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+    <!-- 添加或修改任务对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+      :show-close="false"
+    >
+      <el-form
+        size="mini"
+        ref="form"
+        :model="form"
+        label-width="80px"
+      >
+        <el-form-item label="物料">
+          <DrPopoverSelectV2
+            size="mini"
+            v-model="form.materialName"
+            valueKey= "name"
+            referName="MATERIAL_PARAM"
+            :dataMapping="{
+              material: 'id',
+              materialCode: 'code',
+            }"
+            :source.sync="form"
+          >
+          </DrPopoverSelectV2>
+        </el-form-item>
+        <el-form-item label="客户">
+          <DrPopoverSelectV2
+            size="mini"
+            v-model="form.customerName"
+            valueKey= "name"
+            referName="CUSTOMER_PARAM"
+            :dataMapping="{
+              customer: 'id',
+              customerCode: 'code',
+            }"
+            :source.sync="form"
+          >
+          </DrPopoverSelectV2>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button
+          size="mini"
+          type="primary"
+          @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button size="mini" @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+
+<script>
+import {list,detail,insert,update,del} from '@/api/purchase/ownershipLot.js'
+
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 列表数据
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        params:{
+          materialNameOrCode: null,
+          customerNameOrCode: null,
+        },
+      },
+      // 表单参数
+      form: {
+      },
+    };
+  },
+  async created() {
+    await this.getList();
+  },
+  methods: {
+    /** 查询任务列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.form = {};
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    btnQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    btnResetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        params:{
+          materialNameOrCode: null,
+          customerNameOrCode: null,
+        },
+      };
+      this.btnQuery();
+    },
+    /** 修改按钮操作 */
+    btnUpdate(row) {
+      const id = row.id;
+      detail(id).then(response => {
+        this.form = {...this.form,...response.data};
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交表单 */
+    submitForm() {
+      if(this.form.id){
+        update(this.form).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.form = {};
+          this.getList();
+        });
+      }else{
+        insert(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.form = {};
+          this.getList();
+        });
+      }
+    },
+    btnAdd(){
+      this.open = true;
+      this.title = "新增";
+    },
+    btnDelete(row){
+      this.$modal.confirm('是否确认删除"' + row.materialName + "+" + row.customerName + '"数据？').then(function() {
+        return del(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

src/views/purchase/transferOrder/add.vue

@@ -1221,6 +1221,7 @@
               </el-table>
             </el-tab-pane>
           </el-tabs>
+          <el-button type="primary" style='position: absolute;right:10px;top:5px;' size="mini" v-if="sonPageStu == 'check' || sonPageStu == 'edit'" @click="showReserved">货权预留单</el-button>
           <el-button type="primary" style='position: absolute;right:10px;top:5px;' size="mini" v-if="!sonDisable" @click="addLine">增行</el-button>
         </div>
         <el-divider content-position="left">表尾信息</el-divider>
@@ -1378,7 +1379,7 @@
         <el-button size="mini" plain @click="back">返回</el-button>
       </div>
     </el-card>
-
+    <Reserved v-if="dialog.config" :isVisible="dialog.config" :info="row" @updateReserved="updateReserved"/>
     <Refers ref="refer" @doSubmit="selectionsToInput" :single="true" />
     <TreeRefers ref="tree" @doSubmit="selectionsToInput2" :single="true" />
     <popDialog ref="materialRefer" @doSubmit="selectMaterial" :single="true" />
@@ -1387,6 +1388,7 @@
 </template>
 
 <script>
+import Reserved from './reserved.vue'
 import { toOA } from "@/api/purchase/purchaseDemand.js";
 import {
   addOrder,
@@ -1414,6 +1416,7 @@ export default {
   ],
   props: ["pageStu", "row", "disable"],
   components: {
+    Reserved,
     Refers,
     TreeRefers,
     popDialog,
@@ -1541,6 +1544,9 @@ export default {
       isOrg: true,
       isDRCk: true,
       isDCCk: true,
+      dialog: {
+        config: false
+      },
     };
   },
   created() {
@@ -2247,6 +2253,14 @@ export default {
         }
       });
     },
+    // 点击预留单展示
+    showReserved() {
+      this.dialog.config = true
+    },
+    // 修改是否让页面显示与隐藏的事件
+	  updateReserved (val) {
+      this.dialog.config = val
+    },
   },
 };
 </script>

src/views/purchase/transferOrder/reserved.vue

@@ -5,60 +5,69 @@
       :before-close="handleClose"
       width="70%"
     >
-    <el-descriptions class="margin-top" title="货权预留单" :column="3" size="small" border>
-      <el-descriptions-item>
-        <template slot="label">
-          预留单据号
-        </template>
-        {{ resData.code }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          来源单据号
-        </template>
-        {{ resData.source }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          客户名称
-        </template>
-        {{ resData.customerName }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          创建人
-        </template>
-        {{ resData.createByName }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          创建人编码
-        </template>
-        {{ resData.createBy }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          创建时间
-        </template>
-        {{ resData.createTime }}
-      </el-descriptions-item>
-    </el-descriptions>
-      <el-table style="margin-top: 50px" :data="items" @row-click="rowClick">
+      <el-descriptions class="margin-top" title="货权预留单" :column="3" size="small" border>
+        <el-descriptions-item>
+          <template slot="label">
+            预留单据号
+          </template>
+          {{ resData.code }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            来源单据号
+          </template>
+          {{ resData.source }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            客户名称
+          </template>
+          {{ resData.customerName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            创建人
+          </template>
+          {{ resData.createByName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            创建人编码
+          </template>
+          {{ resData.createBy }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            创建时间
+          </template>
+          {{ resData.createTime }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-table style="margin-top: 50px" :data="items" @row-click="rowClick" height="300px">
         <el-table-column show-overflow-tooltip prop="materialCode" label="物料编码" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="materialName" label="物料名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="unitName" label="单位名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="reservedQty" label="预留数量" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="totalIn" label="累计入库数量" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="qty" label="可用量" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="usedQty" label="已用量" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="warehouseName" label="仓库名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="allocationName" label="货位名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="createTime" label="创建时间" width="200"></el-table-column>
       </el-table>
-      <el-table style="margin-top: 50px" :data="showHistoryItems">
+      <el-table style="margin-top: 50px" :data="showHistoryItems" height="300px">
         <el-table-column show-overflow-tooltip prop="materialCode" label="物料编码" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="materialName" label="物料名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="unitName" label="单位名称" width="150"></el-table-column>
-        <el-table-column show-overflow-tooltip prop="allotQty" label="操作数量" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateType" label="操作类型" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateBill" label="操作单据" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateBillcode" label="操作单据编码" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateBillitem" label="操作明细行" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="allotQty" label="操作数量" width="150">
+          <template slot-scope="scope">
+            {{scope.row.allotQty > 0 ? "+" + scope.row.allotQty : scope.row.allotQty}}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip prop="createTime" label="操作时间" width="200"></el-table-column>
       </el-table>
     </el-dialog>