feat:计划借调列表查询接口联调

sgzb-ui/src/api/store/newBuy.js

@@ -339,7 +339,7 @@ export function getPlanList(query) {
     params: query,
   });
 }
-//
+//借调操作
 export function addOrUpdateMange(data) {
   return request({
     url: "/material/planManagement/addOrUpdateMange",
@@ -347,3 +347,11 @@ export function addOrUpdateMange(data) {
     data: data,
   });
 }
+//计划借调列表
+export function getManageList(query) {
+  return request({
+    url: "/material/planManagement/getManageList",
+    method: "get",
+    params: query,
+  });
+}

sgzb-ui/src/views/store/newBuy/planSecond.vue

@@ -8,9 +8,9 @@
       v-show="showSearch"
       label-width="80px"
     >
-      <el-form-item label="名称" prop="dictName">
+      <el-form-item label="名称" prop="name">
         <el-input
-          v-model="queryParams.dictName"
+          v-model="queryParams.name"
           placeholder="请输入名称"
           clearable
           maxlength="50"
@@ -52,24 +52,56 @@
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
+      <el-table-column label="序号" align="center">
-      <el-table-column label="物资名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <template slot-scope="scope">{{ scope.$index + 1 }}</template>
-      <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      </el-table-column>
-      <el-table-column label="单位" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-      <el-table-column label="借出方单位" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column
-      <el-table-column label="原计划数" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        label="规格型号"
-      <el-table-column label="现计划数" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        align="center"
-      <el-table-column label="借入方单位" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        prop="typeModelName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="借出方单位"
+        align="center"
+        prop="borrowerCompany"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="原计划数"
+        align="center"
+        prop="borrowerOrigPlanNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="现计划数"
+        align="center"
+        prop="borrowerNowPlanNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="借入方单位"
+        align="center"
+        prop="lenderCompany"
+        :show-overflow-tooltip="true"
+      />
 
       <!--      <el-table-column label="原计划数" align="center" prop="dictName" :show-overflow-tooltip="true" />-->
-      <el-table-column label="现有计划数" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column
-      <el-table-column label="借调数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        label="现有计划数"
-      <el-table-column label="操作人" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        align="center"
-      <el-table-column label="操作时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        prop="lenderNowPlanNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="借调数量" align="center" prop="borrowNum" :show-overflow-tooltip="true" />
+      <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" />
+      <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
 
-      <el-table-column label="备注" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
 
-      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -86,7 +118,7 @@
             v-hasPermi="['store:labelType:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -242,7 +274,11 @@ import {
   refreshCache
 } from "@/api/system/dict/type";
 import { getunitInfoAll } from "@/api/store/tools";
-import { getPlanList, addOrUpdateMange } from "@/api/store/newBuy";
+import {
+  getPlanList,
+  addOrUpdateMange,
+  getManageList
+} from "@/api/store/newBuy";
 
 export default {
   name: "PlanSecond",
@@ -276,9 +312,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        dictName: undefined,
+        name: undefined
-        dictType: undefined,
-        status: undefined
       },
       //弹窗查询参数
       dialogParams: {
@@ -314,7 +348,7 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      listType(this.queryParams).then(response => {
+      getManageList(this.queryParams).then(response => {
         this.typeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -434,7 +468,13 @@ export default {
               }
             });
             addOrUpdateMange(this.dialogForm).then(res => {
-              console.log(res);
+              if (res.code == 200) {
+                this.$message.success("借调成功");
+                this.open = false;
+                this.resetQuery();
+              } else {
+                this.$message.error("借调失败，请联系管理员");
+              }
             });
           }
         }