完善

src/api/purchase/purchase-order.js

@@ -39,7 +39,7 @@ export function getPurchaseOrderPage2 (parameter) {
  */
 export function getpurchaseRecord (parameter) {
   return axios({
-    url: '/longyanpurchaseorder/order/getpurchaseRecord',
+    url: '/longyanpurchaseorder/detail/get/record',
     method: 'get',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8'

src/utils/dict.js

@@ -339,6 +339,7 @@ DictCache.TYPE = {
   SUPPLY_TYPE: 'SUPPLY_TYPE', // 供应类型
   YONG_YOU_DEPT: 'YONG_YOU_DEPT', // 部门
   LONG_YAN_PURCHASE_BUSINESS_TYPE: 'LONG_YAN_PURCHASE_BUSINESS_TYPE', // 业务类型
+  LONG_YAN_PURCHASE_ORDER_STATUS: 'LONG_YAN_PURCHASE_ORDER_STATUS', // 采购单状态
   GROUP_TYPE: 'GROUP_TYPE' // 计量单位组类别
 }
 DictCache.CODE = {
@@ -1540,6 +1541,20 @@ DictCache.COLOR = {
     2: 'warning', // 二级
     3: 'default' // 三级
   },
+  /**
+   * 采购单状态
+   */
+  LONG_YAN_PURCHASE_ORDER_STATUS: {
+    1: 'default', // "草稿"
+    2: 'warning', // "待推送"
+    3: 'warning', // "已推送"
+    4: 'warning', // "待审核"
+    5: 'processing', // "已审核"
+    6: 'processing', // "采购中"
+    7: 'success', // "采购完成"
+    8: 'error' // "推送失败"
+
+  },
   /**
    * 报修状态
    */

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

@@ -61,6 +61,9 @@
             title="是否要删除该条数据？"
             @confirm="batchDelete(record.id)">删除</operation-button>
         </span>
+        <template #status="text">
+          <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.LONG_YAN_PURCHASE_ORDER_STATUS[text]"/>
+        </template>
       </s-table>
     </div>
     <BaseForm ref="baseForm" @ok="handleOk"/>
@@ -150,6 +153,15 @@ export default {
           width: 100,
           dataIndex: 'remark'
         },
+        {
+          title: '状态',
+          dataIndex: 'status',
+          width: '100px',
+          fixed: 'right',
+          checked: true,
+          align: 'center',
+          scopedSlots: { customRender: 'status' }
+        },
         {
           title: '操作',
           key: 'action',
@@ -185,12 +197,15 @@ export default {
           selectedRowKeys: this.selectedRowKeys
         }
       },
-      optionAlertShow: false
+      optionAlertShow: false,
+      statusMap: {}
     }
   },
   created () {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LONG_YAN_PURCHASE_TYPE)
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LONG_YAN_PURCHASE_ORDER_STATUS)
+    console.log(this.statusMap)
     this.tableOption()
   },
   methods: {

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

@@ -4,9 +4,32 @@
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="关键字">
-                <a-input v-model.trim="queryParam.keyword" placeholder="请输入名称/类型名称"/>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="设备名称">
+                <a-input v-model.trim="queryParam.sbName" placeholder="请输入设备名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="设备位号">
+                <a-input v-model.trim="queryParam.positionNo" placeholder="请输入设备位号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="设备名称">
+                <a-date-picker
+                  :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+                  v-model="queryParam.createdTimeStart"
+                  placeholder="开始时间"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="设备位号">
+                <a-date-picker
+                  :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+                  v-model="queryParam.createTimeEnd"
+                  placeholder="结束时间"
+                />
               </a-form-item>
             </a-col>
             <a-col :md="8 || 24" :sm="24">
@@ -232,12 +255,11 @@ export default {
       moneyTypeMap: {},
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        const user = this.$store.getters.userInfo
-        const roleCodes = user.roleCodes.join(',')
+        this.queryParam.createdTimeStart = this.queryParam.createdTimeStart ? this.BaseTool.Date.formatter(this.queryParam.createdTimeStart, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) + ' 00:00:00' : null
+        this.queryParam.createTimeEnd = this.queryParam.createTimeEnd ? this.BaseTool.Date.formatter(this.queryParam.createTimeEnd, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) + ' 23:59:59' : null
         parameter = {
           ...parameter,
           ...this.queryParam,
-          projectId: roleCodes.indexOf('FGS_') > -1 ? null : user.projectId,
           dataScope: {
             sortBy: 'asc,desc',
             sortName: 'status,update_time'