Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/api/purchase/purchaseDemand.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 采购需求单列表
 export function getDemandList(data) {
   return request({
-    url: `/pu/demand/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    url: `/pu/demand/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}&isAsc=desc&orderByColumn=updateTime`,
     method: 'post',
     data: data
   })

src/api/purchase/transferOrder.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 调拨订单列表
 export function getOrderList(data) {
   return request({
-    url: `/pu/allot/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    url: `/pu/allot/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}&isAsc=desc&orderByColumn=updateTime`,
     method: 'post',
     data: data
   })

src/views/material/basicFile/details.vue

@@ -1728,7 +1728,7 @@
           default:
             break;
         }
-        this.handleOtherRefresh();
+        // this.handleOtherRefresh();
       },
       // 其他页签详情弹窗关闭事件
       handleCloseOtherDetails(done) {
@@ -1979,6 +1979,7 @@
         materialApi.financeEdit(data).then(res => {
           if (res.code == 200) {
             this.otherDeatils.isEdit = false;
+            this.handleOtherRefresh();
           }
         })
       },
@@ -1988,6 +1989,7 @@
         materialApi.centerEdit(data).then(res => {
           if (res.code == 200) {
             this.otherDeatils.isEdit = false;
+            this.handleOtherRefresh();
           }
         })
       },
@@ -1997,6 +1999,7 @@
         materialApi.purchaseEdit(data).then(res => {
           if (res.code == 200) {
             this.otherDeatils.isEdit = false;
+            this.handleOtherRefresh();
           }
         })
       },
@@ -2006,6 +2009,7 @@
         materialApi.inventoryEdit(data).then(res => {
           if (res.code == 200) {
             this.otherDeatils.isEdit = false;
+            this.handleOtherRefresh();
           }
         })
       },
@@ -2015,6 +2019,7 @@
         materialApi.planEdit(data).then(res => {
           if (res.code == 200) {
             this.otherDeatils.isEdit = false;
+            this.handleOtherRefresh();
           }
         })
       },
@@ -2024,6 +2029,7 @@
         materialApi.costEdit(data).then(res => {
           if (res.code == 200) {
             this.otherDeatils.isEdit = false;
+            this.handleOtherRefresh();
           }
         })
       },

src/views/purchase/DemandSummary/index.vue

@@ -209,33 +209,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="1.5">
-              <el-form-item label="处理审核时间">
-                <el-date-picker
-                  v-model="queryParams.auditTime"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  size="small"
-                  style="width: 200px"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="处理确认时间">
-                <el-date-picker
-                  v-model="queryParams.yesTime"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  size="small"
-                  style="width: 200px"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="10">
-            <el-col :span="1.5">
               <el-form-item label="审批结束日期">
                 <el-date-picker
                   v-model="queryParams.approverFinishTime"
@@ -485,8 +458,6 @@ export default {
         names: '',
         purchaseOrg: '',
         demandDate: '',
-        auditTime: '',
-        yesTime: '',
         approverFinishTime: '',
         pageNum: 1,
         pageSize: 5
@@ -581,8 +552,7 @@ export default {
         names: '',
         purchaseOrg: '',
         demandDate: '',
-        auditTime: '',
-        yesTime: '',
+        approverFinishTime: '',
         pageNum: 1,
         pageSize: 5
       }