采购-预留：新版预留功能开发

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/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/purchase/PurchaseDemandList/add.vue

@@ -297,7 +297,7 @@
                 </el-select>
             </template>
           </ux-table-column> -->
-          <ux-table-column resizable title="预留周期" align="center" field="reservedPeriod" width="120px" edit-render>
+          <!-- <ux-table-column resizable title="预留周期" align="center" field="reservedPeriod" width="120px" edit-render>
             <template v-slot:edit="scope">
                 <el-input type="number" min="0" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')" clearable :disabled="sonDisable" size="mini" v-model="scope.row.reservedPeriod"></el-input>
             </template>
@@ -306,7 +306,7 @@
             <template v-slot:edit="scope">
                 <el-input type="number" min="0" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"  @input="scope.row.reservedQty=Math.ceil(scope.row.reservedQty)" clearable :disabled="sonDisable" size="mini" v-model="scope.row.reservedQty"></el-input>
             </template>
-          </ux-table-column>
+          </ux-table-column> -->
           <ux-table-column resizable title="集团预测分类" align="center"  field="forecastClassify" width="120px"/>
           <ux-table-column resizable title="近一月需求" align="center"  field="onemonthAvgVolume" width="100px"/>
           <ux-table-column resizable title="近三月需求" align="center"  field="threemonthAvgVolume" width="100px"/>

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/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>