前端

src/api/V2/contract/index.js

@@ -25,6 +25,8 @@ export const API_POST_CONTRACT_DELETE = '/contractManagementInfo/deleteInfo '
 export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'
 // 获取负责人
 export const API_GET_STAFF = '/staff/query/getStaffListByCompId'
+// 获取现货采购负责人
+export const API_GET_STAFF_FIND = '/staff/query/findRole'
 //运输任务-添加-根据仓库类型选库名
 export const API_GET_TRAN_TASK_WAREHOUSE = '/tranTaskInfo/selectWarehouseList'
 

src/model/contarct/index.js

@@ -21,7 +21,8 @@ import {
     API_POST_CONFIRMATIONSHEET_ADD,
     API_GET_GETINFO,
     API_POST_CONFIRMATIONSHEET_DELETE,
-    API_GET_STAFF
+    API_GET_STAFF,
+    API_GET_STAFF_FIND
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -48,6 +49,8 @@ export const deletecontract = appRx.post(API_POST_CONTRACT_DELETE, errorCatcher,
 export const editInfo = appRx.post(API_POST_EDITINFO, errorCatcher, errorHandle, filter)
 //获取负责人
 export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)
+//获取现货采购负责人
+export const getstafffind = appRx.get(API_GET_STAFF_FIND, errorCatcher, errorHandle, filter)
 //运输任务-添加-根据仓库类型选库名
 export const getwarehousename = appRx.get(API_GET_TRAN_TASK_WAREHOUSE, errorCatcher, errorHandle, filter)
 

src/views/contractManagement/purchaseContractAdd.vue

@@ -548,7 +548,7 @@ import {
   addxiala,
   editxiala,
   delxiala,
-  getstaff,
+  getstafffind,
 } from '@/model/contarct/index'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -644,7 +644,7 @@ export default {
     this.deptBudgetList.contractProcessInfo.gradeKey = 1
     this.deptBudgetList.contractGoodsInfo.grade = '一等品'
     this.deptBudgetList.contractGoodsInfo.gradeKey = 1
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+    getstafffind({ roles: 'd6a5c8a52da544309259f91f75de1ec6' })
       .toPromise()
       .then((response) => {
         this.options = response

src/views/taskManagement/moveWarehouseTask.vue

@@ -217,7 +217,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
-      searchTypeText: '待审核',
+      searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
       taskTypeKey: 3,

src/views/warehouse/warehouseManagementDelivery.vue

@@ -1289,7 +1289,7 @@ export default {
           })
       }
       //合同编号
-      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId') })
+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'),flag:5  })
         .toPromise()
         .then((response) => {
           this.outContractNo = response

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -88,16 +88,18 @@
             </template>
           </el-table-column>
         </el-table>
-
-        <div style="text-align: right; padding: 10px">
-          <el-button
-            class="bg-bottom-up"
-            type="primary"
-            size="small"
-            @click="returnWarehouse()"
-            >关闭</el-button
-          >
-        </div>
+<div style='text-align:center;'>
+   <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+</div>
+       
       </div>
     </ws-form>
   </div>
@@ -330,6 +332,7 @@ export default {
         })
           .toPromise()
           .then((response) => {
+            this.deptBudgetTotal=response.total
             this.improved = response
           })
       } else if (id2 == 2) {

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -1007,7 +1007,7 @@ export default {
           })
       }
       //合同编号
-      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId') })
+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'),flag:5 })
         .toPromise()
         .then((response) => {
           this.outContractNo = response