优化

src/views/purchase/inventory-list/InventoryList.vue

@@ -44,7 +44,6 @@
         </div>
 
         <div class="table-operator" style="margin-bottom: 8px;">
-<!--          <a-button style="margin-left: 8px" @click="handleAdd">新增</a-button>-->
           <a-button style="margin-left: 8px" type="primary" icon="plus" @click="handleAdd">新增物料</a-button>
         </div>
 

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

@@ -7,8 +7,8 @@
     @cancel="handleCancel"
   >
     <a-steps :current="current" style="width:400px;margin:20px auto;">
-      <a-step title="基本信息" />
-      <a-step title="物料明细" />
+      <a-step title="计划信息" />
+      <a-step title="计划明细" />
     </a-steps>
     <a-card v-show="current===0">
       <a-form :form="form">
@@ -272,38 +272,31 @@ export default {
           }
         },
         {
-          title: '名称',
+          title: '物料名称',
           dataIndex: 'spareName'
         },
         {
-          title: '编号',
+          title: '存货编码',
           dataIndex: 'no'
         },
         {
-          title: '规格',
+          title: '规格型号',
           dataIndex: 'ggxh'
         },
-
-        {
-          title: '采购数量',
-          dataIndex: 'num',
-          width: 150,
-          scopedSlots: { customRender: 'num' }
-        },
-        // {
-        //   title: '库存',
-        //   dataIndex: 'storeNum',
-        //   width: 150
-        // },
-
         {
-          title: '仓库',
+          title: '仓库名称',
           dataIndex: 'storeName'
         },
         {
           title: '货架号',
           dataIndex: 'storePosition'
         },
+        {
+          title: '申请数量',
+          dataIndex: 'num',
+          width: 150,
+          scopedSlots: { customRender: 'num' }
+        },
         {
           title: '操作',
           key: 'action',

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

@@ -8,17 +8,17 @@
     @cancel="handleCancel"
   >
     <detail-list title="" :col="2">
-      <detail-list-item term="采购计划名称">{{ model.orderName }}</detail-list-item>
-      <detail-list-item term="采购计划类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
+      <detail-list-item term="计划名称">{{ model.orderName }}</detail-list-item>
+      <detail-list-item term="计划类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
+      <detail-list-item term="计划备注">{{ model.remark }}</detail-list-item>
+      <detail-list-item term="设备位号">{{ model.positionNo }}</detail-list-item>
       <detail-list-item term="厂区">{{ BaseTool.Object.getField(flagMap,model.oldOrNew) }}</detail-list-item>
       <detail-list-item term="项目">{{ model.complateProjectName }}</detail-list-item>
-      <detail-list-item term="设备位号">{{ model.positionNo }}</detail-list-item>
-      <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
-      <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
+      <detail-list-item term="申请人">{{ model.createdUserName }}</detail-list-item>
+      <detail-list-item term="申请日期">{{ model.updateTime }}</detail-list-item>
     </detail-list>
 
-    <title-divider title="采购单明细" width="120px"></title-divider>
+    <title-divider title="计划明细" width="120px"></title-divider>
     <a-table
       bordered
       :data-source="model.detailVOS"
@@ -66,22 +66,22 @@ export default {
           }
         },
         {
-          title: '名称',
+          title: '物料名称',
           width: 100,
           dataIndex: 'spareName'
         },
         {
-          title: '编号',
+          title: '存货编码',
           width: 100,
           dataIndex: 'no'
         },
         {
-          title: '规格',
+          title: '规格型号',
           width: 100,
           dataIndex: 'ggxh'
         },
         {
-          title: '仓库',
+          title: '仓库名称',
           dataIndex: 'storeName',
           width: 100
 
@@ -92,22 +92,22 @@ export default {
           width: 100
         },
         {
-          title: '采购数量',
+          title: '申请数量',
           dataIndex: 'num',
           width: 100
         },
         {
-          title: '已采购数量',
+          title: '已采数量',
           width: 100,
           dataIndex: 'purchasedNum'
         },
         {
-          title: '已入库数量',
+          title: '入库数量',
           width: 100,
           dataIndex: 'inStoreNum'
         },
         {
-          title: '明细状态',
+          title: '采购状态',
           width: 100,
           dataIndex: 'detailStatus',
           customRender: (text, record, index) => {

src/views/purchase/purchase-order-record/PurchaseOrderRecord.vue

@@ -42,20 +42,6 @@
         </a-form>
       </div>
 
-      <!--  <div class="table-operator" style="margin-bottom: 8px;">
-          <a-button v-if="$auth('purchase-purchase-orders-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-        <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-orders-del')">
-          <a-menu slot="overlay">
-            <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
-              <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-            </a-popconfirm>
-          </a-menu>
-          <a-button style="margin-left: 8px">
-            批量操作 <a-icon type="down" />
-          </a-button>
-        </a-dropdown>
-      </div>-->
-
       <s-table
         ref="table"
         size="default"
@@ -76,7 +62,6 @@
         </template>
       </s-table>
     </div>
-    <!--    <purchase-dispatch-order ref="dispatchOrder" @ok="handleOk"/>-->
   </a-card>
 </template>
 
@@ -116,26 +101,26 @@ export default {
           width: 200
         },
         {
-          title: '存货编码',
-          dataIndex: 'no',
+          title: '设备位号',
+          dataIndex: 'sbInfo',
           checked: true,
-          width: 200
+          width: 150
         },
         {
-          title: '规格型号',
-          dataIndex: 'ggxh',
+          title: '物料名称',
+          dataIndex: 'spareName',
           checked: true,
           width: 150
         },
         {
-          title: '设备信息',
-          dataIndex: 'sbInfo',
+          title: '存货编码',
+          dataIndex: 'no',
           checked: true,
-          width: 150
+          width: 200
         },
         {
-          title: '备件名称',
-          dataIndex: 'spareName',
+          title: '规格型号',
+          dataIndex: 'ggxh',
           checked: true,
           width: 150
         },
@@ -152,53 +137,44 @@ export default {
           width: 100
         },
         {
-          title: '采购数量',
+          title: '申请数量',
           dataIndex: 'num',
           checked: true,
           width: 150
         },
         {
-          title: '已采购数量',
+          title: '已采数量',
           dataIndex: 'purchasedNum',
           checked: true,
           width: 150
         },
         {
-          title: '已入库数量',
+          title: '入库数量',
           dataIndex: 'inStoreNum',
           checked: true,
           width: 150
         },
 
         {
-          title: '创建人',
+          title: '申请人',
           dataIndex: 'createdUserName',
           checked: true,
           width: 120
         },
         {
-          title: '创建时间',
+          title: '申请时间',
           dataIndex: 'createdTime',
           checked: true,
           width: 120
         },
         {
-          title: '明细状态',
+          title: '采购状态',
           width: 100,
           dataIndex: 'detailStatus',
           fixed: 'right',
           checked: true,
           scopedSlots: { customRender: 'detailStatus' }
         }
-        // {
-        //   title: '操作',
-        //   key: 'action',
-        //   width: '200px',
-        //   fixed: 'right',
-        //   checked: true,
-        //   align: 'center',
-        //   scopedSlots: { customRender: 'action' }
-        // }
       ],
       // 下拉框map
       typeMap: {},