瀏覽代碼

采购-预留:页面功能优化;

001295 1 年之前
父節點
當前提交
df47e4de6c

+ 2 - 1
src/views/purchase/PurchaseDemandList/reserved.vue

@@ -58,7 +58,8 @@
       <el-table style="margin-top: 50px" :data="showHistoryItems" height="300px">
         <el-table-column prop="materialCode" label="物料编码" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="materialName" label="物料名称" width="200"></el-table-column>
-        <el-table-column prop="unitName" label="单位名称" width="100"></el-table-column>
+        <el-table-column prop="unitName" label="单位" width="100"></el-table-column>
+        <el-table-column prop="productBatchNum" label="批号" width="100"></el-table-column>
         <el-table-column label="操作单据" align="center" prop="operateBill"  width="100">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.ow_operatetype" :value="scope.row.operateBill"/>

+ 2 - 0
src/views/purchase/ownership/index.vue

@@ -56,6 +56,7 @@
     >
       <el-table-column label="序号" type="index" width="50" align="center" fixed/>
       <el-table-column show-overflow-tooltip width="200" label="来源单据" align="center" prop="source" />
+      <el-table-column show-overflow-tooltip width="150" label="集采编号" align="center" prop="puCode" />
       <el-table-column show-overflow-tooltip width="200" label="客户" align="center" prop="customerName" />
       <el-table-column show-overflow-tooltip width="150" label="物料编码" align="center" prop="materialCode" />
       <el-table-column show-overflow-tooltip width="300" label="物料" align="center" prop="materialName" />
@@ -105,6 +106,7 @@
       >
         <el-descriptions :column="1">
           <el-descriptions-item label="单据来源">{{form.source}}</el-descriptions-item>
+          <el-descriptions-item label="集采编号">{{form.puCode}}</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>

+ 14 - 8
src/views/purchase/transferOrder/reserved.vue

@@ -56,18 +56,23 @@
         <el-table-column show-overflow-tooltip prop="createTime" label="创建时间" width="200"></el-table-column>
       </el-table>
       <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="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">
+        <el-table-column prop="materialCode" label="物料编码" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="materialName" label="物料名称" width="200"></el-table-column>
+        <el-table-column prop="unitName" label="单位" width="100"></el-table-column>
+        <el-table-column prop="productBatchNum" label="批号" width="100"></el-table-column>
+        <el-table-column label="操作单据" align="center" prop="operateBill"  width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.ow_operatetype" :value="scope.row.operateBill"/>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="operateBillcode" label="操作单据编码" width="200"></el-table-column>
+        <el-table-column prop="operateBillitem" label="操作明细行号" width="150"></el-table-column>
+        <el-table-column 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-column prop="createTime" label="操作时间" width="200"></el-table-column>
       </el-table>
     </el-dialog>
   </div>
@@ -77,6 +82,7 @@
 import {getDetailBySource} from '@/api/purchase/ownership.js'
 
 export default {
+  dicts: ['ow_operatetype'],
   props: {
     isVisible: {
       type: Boolean,