完善

src/utils/dict.js

@@ -345,7 +345,8 @@ DictCache.TYPE = {
   CSR_POLICY: 'CSR_POLICY', // 供需政策
   PLAN_METHOD: 'PLAN_METHOD', // 计划方法
   ADD_SPARE_STATUS: 'ADD_SPARE_STATUS', // 存货推送状态
-  SO_TYPE: 'SO_TYPE' // 需求跟踪方式
+  SO_TYPE: 'SO_TYPE', // 需求跟踪方式,
+  LONG_YAN_PURCHASE_DETAIL_STATUS: 'LONG_YAN_PURCHASE_DETAIL_STATUS'
 
 }
 DictCache.CODE = {

src/views/purchase/purchase-order-page/PurchaseOrderPage.vue

@@ -56,7 +56,6 @@
             @click="handlePush(record)"
           >推送</operation-button>
           <operation-button
-            v-if="record.status===3"
             @click="handleViewPurchase(record)"
           >请购单</operation-button>
           <operation-button

src/views/purchase/purchase-order-page/modules/Detail.vue

@@ -53,47 +53,75 @@ export default {
       flagMap: {},
       invoiceUrls: [],
       moneyTypeMap: {},
+      statusMap: {},
       model: {
       },
       columns: [
         {
           title: '序号',
           dataIndex: 'index',
+          width: 70,
           customRender: (text, record, index) => {
             return index + 1
           }
         },
         {
           title: '名称',
+          width: 100,
           dataIndex: 'spareName'
         },
         {
           title: '编号',
+          width: 100,
           dataIndex: 'no'
         },
         {
           title: '规格',
+          width: 100,
           dataIndex: 'ggxh'
         },
         {
           title: '仓库',
-          dataIndex: 'storeName'
+          dataIndex: 'storeName',
+          width: 100
+
         },
         {
           title: '货架号',
-          dataIndex: 'storePosition'
+          dataIndex: 'storePosition',
+          width: 100
         },
         {
           title: '采购数量',
           dataIndex: 'num',
-          width: 150,
-          scopedSlots: { customRender: 'num' }
+          width: 100
+        },
+        {
+          title: '已采购数量',
+          width: 100,
+          dataIndex: 'purchasedNum'
+        },
+        {
+          title: '已入库数量',
+          width: 100,
+          dataIndex: 'inStoreNum'
+        },
+        {
+          title: '明细状态',
+          width: 100,
+          dataIndex: 'detailStatus',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Table.getMapText(this.statusMap, text)
+          }
         }
+
       ]
     }
   },
   created () {
     // 下拉框map
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LONG_YAN_PURCHASE_DETAIL_STATUS)
+    console.log(this.statusMap)
     this.flagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PROJECT_NEW_AND_OLD)
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LONG_YAN_PURCHASE_TYPE)
   },

src/views/purchase/purchase-order-page/modules/PurchaseOrderList.vue

@@ -26,8 +26,7 @@
       </s-table>
     </a-card>
     <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">取消</a-button>
-      <a-button :loading="confirmLoading" type="primary" @click="handleSelect()">选择</a-button>
+      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
     </template>
   </a-modal>
 </template>