From ab8bd22d4104250d6ce57008c121194b973c0a28 Mon Sep 17 00:00:00 2001
From: jackal <13856223047@163.com>
Date: Wed, 10 Apr 2024 15:12:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A1=E5=88=92=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/store/newBuy.js            | 349 +++++++++++----------
 sgzb-ui/src/views/store/newBuy/plan.vue    |  24 +-
 sgzb-ui/src/views/store/newBuy/planAdd.vue |  18 +-
 sgzb-ui/vue.config.js                      |   3 +-
 4 files changed, 202 insertions(+), 192 deletions(-)

diff --git a/sgzb-ui/src/api/store/newBuy.js b/sgzb-ui/src/api/store/newBuy.js
index 6d9a446c..2dc134fa 100644
--- a/sgzb-ui/src/api/store/newBuy.js
+++ b/sgzb-ui/src/api/store/newBuy.js
@@ -1,334 +1,341 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 // 查询新购任务列表
 export function listPurchaseCheckInfo(query) {
-    return request({
-      url: '/material/purchaseCheckInfo/list',
-      method: 'get',
-      params: query
-    })
-  }
-//新增新购任务
-  export function addPurchaseCheckInfo(data) {
-    return request({
-      url: '/material/purchaseCheckInfo',
-      method: 'post',
-      data: data
-    })
-  }
- //编辑新购任务
- export function updatePurchaseCheckInfo(data) {
   return request({
-    url: '/material/purchaseCheckInfo',
-    method: 'put',
-    data: data
-  })
+    url: "/material/purchaseCheckInfo/list",
+    method: "get",
+    params: query,
+  });
+}
+//新增新购任务
+export function addPurchaseCheckInfo(data) {
+  return request({
+    url: "/material/purchaseCheckInfo",
+    method: "post",
+    data: data,
+  });
+}
+//编辑新购任务
+export function updatePurchaseCheckInfo(data) {
+  return request({
+    url: "/material/purchaseCheckInfo",
+    method: "put",
+    data: data,
+  });
 }
 //任务 详情
 export function getPurchaseCheckInfo(query) {
   return request({
-    url: '/material/purchaseCheckInfo/getDetails',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseCheckInfo/getDetails",
+    method: "get",
+    params: query,
+  });
 }
 //消息通知
 export function bmNoticeInfo(data) {
   return request({
-    url: '/material/purchaseCheckInfo/bmNoticeInfo',
-    method: 'post',
-    data: data
-  })
+    url: "/material/purchaseCheckInfo/bmNoticeInfo",
+    method: "post",
+    data: data,
+  });
 }
 
-
 // 新购验收--验收弹窗-确认验收
 export function updatePurchaseCheckDetails(data) {
   return request({
-    url: '/material/purchaseCheckDetails',
-    method: 'put',
-    data: data
-  })
+    url: "/material/purchaseCheckDetails",
+    method: "put",
+    data: data,
+  });
 }
 
 // 新购验收-编号管理列表
 export function listPurchaseMacodeInfo(query) {
   return request({
-    url: '/material/purchaseMacode/list',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseMacode/list",
+    method: "get",
+    params: query,
+  });
 }
 
 export function getMacodeInfo(taskId) {
   return request({
-    url: '/material/purchaseMacode/' + taskId,
-    method: 'get'
-  })
+    url: "/material/purchaseMacode/" + taskId,
+    method: "get",
+  });
 }
 // 新购验收-编号管理-新增
 export function addPurchaseMacode(data) {
   return request({
-    url: '/material/purchaseMacode',
-    method: 'post',
-    data: data
-  })
+    url: "/material/purchaseMacode",
+    method: "post",
+    data: data,
+  });
 }
 // 修改
 export function updateMacode(data) {
   return request({
-    url: '/material/purchaseMacode',
-    method: 'put',
-    data: data
-  })
+    url: "/material/purchaseMacode",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除
 export function delMacode(taskIds) {
   return request({
-    url: '/material/purchaseMacode/' + taskIds,
-    method: 'delete'
-  })
+    url: "/material/purchaseMacode/" + taskIds,
+    method: "delete",
+  });
 }
 
-
 //新购验收-编号管理-绑定弹窗详情列表
 export function getMacodeList(query) {
   return request({
-    url: '/material/purchaseMacode/list',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseMacode/list",
+    method: "get",
+    params: query,
+  });
 }
 
 //新购验收-编号管理-绑定弹窗详情列表
 export function getMacodeDetailList(query) {
   return request({
-    url: '/material/purchaseMacode/getInfo',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseMacode/getInfo",
+    method: "get",
+    params: query,
+  });
 }
 //新购验收-编号管理-生成编码
 export function makeEquipmentNumber(data) {
   return request({
-    url: '/material/purchaseMacode/equipmentNumber',
-    method: 'post',
-    data: data
-  })
+    url: "/material/purchaseMacode/equipmentNumber",
+    method: "post",
+    data: data,
+  });
 }
 //新购验收-编号管理-保存
 export function editPurchaseMacode(data) {
   return request({
-    url: '/material/purchaseMacode',
-    method: 'post',
-    data: data
-  })
+    url: "/material/purchaseMacode",
+    method: "post",
+    data: data,
+  });
 }
 
 // 删除
 export function delMacodeList(maCode) {
   return request({
-    url: '/material/purchaseMacode/' + maCode,
-    method: 'delete'
-  })
+    url: "/material/purchaseMacode/" + maCode,
+    method: "delete",
+  });
 }
 
 //新购验收-验收-通知-常用人员
 export function getNoticeUserList(query) {
   return request({
-    url: '/system/person/list',
-    method: 'get',
-    params: query
-  })
+    url: "/system/person/list",
+    method: "get",
+    params: query,
+  });
 }
 //新购验收-验收-通知-所有人员
 export function getAllNotificationList(query) {
   return request({
-    url: '/system/person/notification',
-    method: 'get',
-    params: query
-  })
+    url: "/system/person/notification",
+    method: "get",
+    params: query,
+  });
 }
 //新购验收-验收-通知-常用人员-添加
 export function addNoticeUser(data) {
   return request({
-    url: '/system/person',
-    method: 'post',
-    data: data
-  })
+    url: "/system/person",
+    method: "post",
+    data: data,
+  });
 }
 // 删除
 export function delNoticeUser(id) {
   return request({
-    url: '/system/person/' + id,
-    method: 'delete'
-  })
+    url: "/system/person/" + id,
+    method: "delete",
+  });
 }
 
-
-
 //新购验收-入库列表
 export function getPutInList(query) {
   return request({
-    url: '/material/purchaseCheckInfo/putInList',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseCheckInfo/putInList",
+    method: "get",
+    params: query,
+  });
 }
 export function getPutinDetailsList(query) {
   return request({
-    url: '/material/purchaseMacode/putinDetails',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseMacode/putinDetails",
+    method: "get",
+    params: query,
+  });
 }
 
 // 修改状态-审核
 export function changePutinStatus(data) {
   return request({
-    url: '/material/purchaseMacode/manageStatus',
-    method: 'put',
-    data: data
-  })
+    url: "/material/purchaseMacode/manageStatus",
+    method: "put",
+    data: data,
+  });
 }
 
-
 //新购工机具验收单
 export function getAcceptanceForm(query) {
   return request({
-    url: '/material/purchaseCheckInfo/getAcceptanceForm',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseCheckInfo/getAcceptanceForm",
+    method: "get",
+    params: query,
+  });
 }
 
 //新购工机具入库单
 export function warehousingEntry(query) {
   return request({
-    url: '/material/purchaseMacode/warehousingEntry',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseMacode/warehousingEntry",
+    method: "get",
+    params: query,
+  });
 }
 
-
-
 // 配件所属上级树
 export function getAccessoryTree(data) {
   return request({
-    url: '/system/select/getAccessoryTree',
-    method: 'post',
-    data: data
-  })
+    url: "/system/select/getAccessoryTree",
+    method: "post",
+    data: data,
+  });
 }
 // 查询新购配件列表
 export function listPurchaseAccessory(query) {
   return request({
-    url: '/material/purchaseAccessory/list',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseAccessory/list",
+    method: "get",
+    params: query,
+  });
 }
 //新增新购配件任务
 export function addPurchaseAccessory(data) {
   return request({
-    url: '/material/purchaseAccessory',
-    method: 'post',
-    data: data
-  })
+    url: "/material/purchaseAccessory",
+    method: "post",
+    data: data,
+  });
 }
 //配件任务 详情
 export function getPurchaseAccessoryDetails(query) {
   return request({
-    url: '/material/purchaseAccessory/getDetails',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseAccessory/getDetails",
+    method: "get",
+    params: query,
+  });
 }
- //编辑新购配件任务
- export function updatePurchaseAccessory(data) {
+//编辑新购配件任务
+export function updatePurchaseAccessory(data) {
   return request({
-    url: '/material/purchaseAccessory/edit',
-    method: 'post',
-    data: data
-  })
+    url: "/material/purchaseAccessory/edit",
+    method: "post",
+    data: data,
+  });
 }
 //验收新购配件任务
 export function checkPurchaseAccessory(data) {
   return request({
-    url: '/material/purchaseAccessory/check',
-    method: 'post',
-    data: data
-  })
+    url: "/material/purchaseAccessory/check",
+    method: "post",
+    data: data,
+  });
 }
 
-
 //删除新购配件任务
 export function delPurchaseAccessory(taskIds) {
   return request({
-    url: '/material/purchaseAccessory/' + taskIds,
-    method: 'delete'
-  })
+    url: "/material/purchaseAccessory/" + taskIds,
+    method: "delete",
+  });
 }
 
-
 //配件入库 列表
 export function getPurchaseAccessoryPutInList(query) {
   return request({
-    url: '/material/purchaseAccessory/putInList',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseAccessory/putInList",
+    method: "get",
+    params: query,
+  });
 }
 
 //配件入库 配件类型下拉数据
 export function getPartList(query) {
   return request({
-    url: '/material/purchaseAccessory/getPartList',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseAccessory/getPartList",
+    method: "get",
+    params: query,
+  });
 }
 //配件入库 配件类型下拉数据
 export function getAccessoryPutInDetailList(query) {
   return request({
-    url: '/material/purchaseAccessory/putinDetails',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseAccessory/putinDetails",
+    method: "get",
+    params: query,
+  });
 }
 
 //配件入库 审批操作
 export function checkInputAccessory(data) {
   return request({
-    url: '/material/purchaseAccessory/checkInput',
-    method: 'post',
-    data: data
-  })
+    url: "/material/purchaseAccessory/checkInput",
+    method: "post",
+    data: data,
+  });
 }
 
 //新购配件验收单
 export function getAccessoryAcceptanceForm(query) {
   return request({
-    url: '/material/purchaseAccessory/getAcceptanceForm',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseAccessory/getAcceptanceForm",
+    method: "get",
+    params: query,
+  });
 }
 
 //新购配件入库单
 export function accessoryWarehousingEntry(query) {
   return request({
-    url: '/material/purchaseAccessory/warehousingEntry',
-    method: 'get',
-    params: query
-  })
+    url: "/material/purchaseAccessory/warehousingEntry",
+    method: "get",
+    params: query,
+  });
 }
 
 // 删除
 export function purchaseCheckInfoRemove(maCode) {
   return request({
-    url: '/material/purchaseCheckInfo/' + maCode,
-    method: 'delete'
-  })
-}
\ No newline at end of file
+    url: "/material/purchaseCheckInfo/" + maCode,
+    method: "delete",
+  });
+}
+//新增计划管理
+export function addPlanManagement(data) {
+  return request({
+    url: "/material/planManagement/addOrUpdate",
+    method: "post",
+    data: data,
+  });
+}
+//配件入库 配件类型下拉数据
+export function getPlanList(query) {
+  return request({
+    url: "/material/planManagement/getList",
+    method: "get",
+    params: query,
+  });
+}
diff --git a/sgzb-ui/src/views/store/newBuy/plan.vue b/sgzb-ui/src/views/store/newBuy/plan.vue
index 55ec65d6..6111f237 100644
--- a/sgzb-ui/src/views/store/newBuy/plan.vue
+++ b/sgzb-ui/src/views/store/newBuy/plan.vue
@@ -26,22 +26,22 @@
     <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="基层单位" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="物资名称" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="单位" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="计划数" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="计划单价" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="计划总价" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="备注" align="center" prop="" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+      <el-table-column label="基层单位" align="center" prop="lenderCompany" :show-overflow-tooltip="true" />
+      <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+      <el-table-column label="规格型号" align="center" 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="lenderOrigPlanNum" :show-overflow-tooltip="true" />
+      <el-table-column label="计划单价" align="center" prop="planPrice" :show-overflow-tooltip="true" />
+      <el-table-column label="计划总价" align="center" prop="planCost" :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">
         <template slot-scope="scope">
           <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['store:labelType:edit']">编辑</el-button>
           <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['store:labelType:remove']">删除</el-button>
         </template>
-      </el-table-column>
+</el-table-column> -->
     </el-table>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -52,6 +52,8 @@
 
 <script>
 import { listType } from "@/api/system/dict/type";
+import { getPlanList } from "@/api/store/newBuy";
+
 
 export default {
   name: "Plan",
@@ -88,7 +90,7 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      listType(this.queryParams).then(response => {
+      getPlanList(this.queryParams).then(response => {
         this.planList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/sgzb-ui/src/views/store/newBuy/planAdd.vue b/sgzb-ui/src/views/store/newBuy/planAdd.vue
index 0b87f069..d14368ea 100644
--- a/sgzb-ui/src/views/store/newBuy/planAdd.vue
+++ b/sgzb-ui/src/views/store/newBuy/planAdd.vue
@@ -118,7 +118,7 @@
 </template>
 
 <script>
-import { addPurchaseCheckInfo, getPurchaseCheckInfo, updatePurchaseCheckInfo } from "@/api/store/newBuy";
+import { addPlanManagement, getPurchaseCheckInfo, updatePurchaseCheckInfo } from "@/api/store/newBuy";
 import { getUserByRoleList } from "@/api/system/user";
 import { equipmentTypeTree, supplierInfoList, getunitInfoAll } from "@/api/store/tools";
 import Treeselect from "@riophae/vue-treeselect";
@@ -410,14 +410,14 @@ export default {
 
                   } else if (!this.isEdit) {
                     console.log('新增')
-                    // this.loading = true;
-                    // addPurchaseCheckInfo(this.maForm).then(response => {
-                    //   if (response.code == 200) {
-                    //     this.$modal.msgSuccess("新增成功");
-                    //     this.$tab.closeOpenPage({ path: "/store/plan/plan" });
-                    //   }
-                    //   this.loading = false;
-                    // })
+                    this.loading = true;
+                    addPlanManagement(this.maForm).then(response => {
+                      if (response.code == 200) {
+                        this.$modal.msgSuccess("新增成功");
+                        this.$tab.closeOpenPage({ path: "/store/plan/plan" });
+                      }
+                      this.loading = false;
+                    })
                   }
                 }).catch(() => { });
               } else {
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 87c4a7da..08e43dcd 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,9 +42,10 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://10.40.92.8:8080`, //超
+        // target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.253:8080`,//韩
         // target: `http://10.40.92.209:8080`,//川/
+        target: `http://10.40.92.153:8080`, //帅
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;