From bc1d5dee1341b6ad011a0a732e9e7ef4804a2c5c Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Fri, 27 Mar 2026 17:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/logisticsManagement/siteBasic.js      |  28 ++
 src/views/logisticsManagement/siteBasic.vue   | 261 ++++++++++++++++++
 .../storagelocationBasic.vue                  | 216 +++++++++++++++
 .../components/processMainte/partDetails.vue  |   2 +-
 .../processMainte/processPlanning.vue         |  17 +-
 .../processMainte/reworkProcessPlanning.vue   |   2 +-
 6 files changed, 516 insertions(+), 10 deletions(-)
 create mode 100644 src/api/logisticsManagement/siteBasic.js
 create mode 100644 src/views/logisticsManagement/siteBasic.vue
 create mode 100644 src/views/logisticsManagement/storagelocationBasic.vue

diff --git a/src/api/logisticsManagement/siteBasic.js b/src/api/logisticsManagement/siteBasic.js
new file mode 100644
index 0000000..be43d59
--- /dev/null
+++ b/src/api/logisticsManagement/siteBasic.js
@@ -0,0 +1,28 @@
+import request from '@/axios';
+
+// 站点列表查询 
+
+export const getStationList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/station/getStationList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+// 库位管理 
+export const getLocationLis = (current, size, params) => {
+  return request({
+    url: '/blade-desk/location/getLocationList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
diff --git a/src/views/logisticsManagement/siteBasic.vue b/src/views/logisticsManagement/siteBasic.vue
new file mode 100644
index 0000000..946e3a8
--- /dev/null
+++ b/src/views/logisticsManagement/siteBasic.vue
@@ -0,0 +1,261 @@
+<template>
+  <basic-container>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left> </template>
+      <template #menu-right> </template>
+      <template #menu="{ row }"> </template>
+
+      <template #stationStatus="scope">
+         <el-tag v-if="scope.row.stationStatus == '0'" type="success">空闲</el-tag>
+        <el-tag v-if="scope.row.stationStatus == '1'" type="danger">占用</el-tag>
+     </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import { getStationList } from '@/api/logisticsManagement/siteBasic';
+export default {
+  components: {},
+  data() {
+    return {
+      form: {},
+      selectionList: [],
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtnText: '修改',
+        labelWidth: 120,
+        menuWidth: 80,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: true,
+        searchShowBtn: false,
+        excelBtn: true,
+        showOverflowTooltip: true,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        gridBtn: false,
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        menu: false,
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        align: 'center',
+        column: [
+          {
+            label: '作业中心',
+            prop: 'wcName',
+            search: false,
+            sortable: true,
+            span: 12,
+            display:false,
+          },
+          {
+            label: '作业中心',
+            prop: 'wcId',
+            search: true,
+            sortable: true,
+            span: 12,
+            filterable: true,
+            hide:true,
+            type: "select",
+            dicUrl:"/api/blade-desk/BA/WorkCenter/listForSelect",
+            props:{
+              label:'wcName',
+              value:'id'
+            }
+
+          },
+          {
+            label: '站点名称',
+            prop: 'stationName',
+            search: true,
+            sortable: true,
+            span: 12,
+          },
+          {
+            label: '站点码',
+            prop: 'stationCode',
+            search: true,
+            sortable: true,
+            span: 12,
+          },
+          {
+            label: '站点状态',
+            prop: 'stationStatus',
+            search: true,
+            sortable: true,
+            span: 12,
+            type: 'select',
+            dicData: [
+              {
+                label: '占用',
+                value: 1,
+              },
+              {
+                label: '空闲',
+                value: 0,
+              },
+            ],
+          },
+          {
+            label: '站点位置',
+            prop: 'stationPosition',
+            search: true,
+            sortable: true,
+            span: 12,
+          },
+        ],
+      },
+
+      data: [],
+    };
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      // addPersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowUpdate(row, index, done, loading) {
+      // updatePersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // return removePersonAbility(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    handleChange(file, fileList) {
+      // proxy.$Export.xlsx(file.raw).then((data) => {
+      //     data.value = data.results;
+      // });
+      this.$message({
+        type: 'success',
+        message: '操作成功!',
+      });
+    },
+
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getStationList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          this.data = res.data.data.records;
+          this.loading = false;
+          this.page.total = res.data.data.total;
+          // this.selectionClear();
+        }
+      );
+    },
+  },
+  mounted() {},
+};
+</script>
+d
\ No newline at end of file
diff --git a/src/views/logisticsManagement/storagelocationBasic.vue b/src/views/logisticsManagement/storagelocationBasic.vue
new file mode 100644
index 0000000..ee845a8
--- /dev/null
+++ b/src/views/logisticsManagement/storagelocationBasic.vue
@@ -0,0 +1,216 @@
+<template>
+  <basic-container>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left> </template>
+      <template #menu-right> </template>
+      <template #menu="{ row }"> </template>
+
+      <template #locationStatus="scope">
+        <el-tag v-if="scope.row.locationStatus == '0'" type="success">空闲</el-tag>
+        <el-tag v-if="scope.row.locationStatus == '1'" type="danger">占用</el-tag>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import { getLocationLis } from '@/api/logisticsManagement/siteBasic';
+export default {
+  components: {},
+  data() {
+    return {
+      form: {},
+      selectionList: [],
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtnText: '修改',
+        labelWidth: 120,
+        menuWidth: 80,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: true,
+        searchShowBtn: false,
+        excelBtn: true,
+        showOverflowTooltip: true,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        gridBtn: false,
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        align: 'center',
+        menu: false,
+        column: [
+          {
+            label: '库位编码',
+            prop: 'locationCode',
+            search: true,
+            sortable: true,
+            span: 12,
+          },
+          {
+            label: '库位状态',
+            prop: 'locationStatus',
+            search: true,
+            sortable: true,
+            span: 12,
+            type: 'select',
+            dicData: [
+              { label: '占用', value: '1' },
+              { label: '空闲', value: '0' },
+            ],
+          },
+        ],
+      },
+
+      data: [],
+    };
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      // addPersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowUpdate(row, index, done, loading) {
+      // updatePersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // return removePersonAbility(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    handleChange(file, fileList) {
+      // proxy.$Export.xlsx(file.raw).then((data) => {
+      //     data.value = data.results;
+      // });
+      this.$message({
+        type: 'success',
+        message: '操作成功!',
+      });
+    },
+
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getLocationLis(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          this.data = res.data.data.records;
+          this.loading = false;
+          this.page.total = res.data.data.total;
+        }
+      );
+    },
+  },
+  mounted() {},
+};
+</script>
+d
\ No newline at end of file
diff --git a/src/views/processManagement/components/processMainte/partDetails.vue b/src/views/processManagement/components/processMainte/partDetails.vue
index a2668d4..cb56d8e 100644
--- a/src/views/processManagement/components/processMainte/partDetails.vue
+++ b/src/views/processManagement/components/processMainte/partDetails.vue
@@ -555,7 +555,7 @@
             </el-table-column>
             <el-table-column prop="tool" label="量具"> </el-table-column>
             <el-table-column prop="toolSize" label="量具尺寸"></el-table-column>
-            <el-table-column prop="toolInfo" label="图纸尺寸"></el-table-column>
+            <el-table-column prop="toolSize" label="图纸尺寸"></el-table-column>
           </el-table>
           <el-table :data="form4.tableData4" style="width: 100%" v-if="activeName == '4'" border>
             <el-table-column prop="moldCode" label="对应工装"> </el-table-column>
diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index 04bdd2a..8184f62 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -166,7 +166,7 @@
                   <el-option
                     v-for="(item, index) in processSetOption"
                     :key="index"
-                    :label="item.name"
+                    :label="`${item.code}-${item.name}`"
                     :value="item.id"
                   ></el-option>
                 </el-select>
@@ -189,7 +189,7 @@
                   <el-option
                     v-for="(item, index) in craftAbilityOption"
                     :key="index"
-                    :label="item.caName"
+                    :label="`${item.caCode}-${item.caName}`"
                     :value="item.id"
                   ></el-option>
                 </el-select>
@@ -197,9 +197,9 @@
             </template>
           </el-table-column>
           <el-table-column prop="proDes" label="工序描述">
-            <template #header>
+            <!-- <template #header>
               <span><i style="color: red">*</i>工序描述</span>
-            </template>
+            </template> -->
             <template #default="scope">
               <el-form-item :prop="`tableData1[${scope.$index}].proDes`" :rules="formRules1.proDes">
                 <el-input v-model="scope.row.proDes" placeholder="请输入"></el-input>
@@ -264,7 +264,7 @@
                   <el-option
                     v-for="(item, index) in projectOptions"
                     :key="index"
-                    :label="item.name"
+                    :label="`${item.code}-${item.name}`"
                     :value="item.id"
                   ></el-option>
                 </el-select>
@@ -388,10 +388,10 @@
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column prop="toolInfo" label="图纸尺寸">
+          <el-table-column prop="toolSize" label="图纸尺寸">
             <template #default="scope">
               <el-input
-                v-model="scope.row.toolInfo"
+                v-model="scope.row.toolSize"
                 placeholder="请输入"
                 style="width: 100%"
               ></el-input>
@@ -569,7 +569,7 @@ export default {
       formRules1: {
         ppsId: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
         caId: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
-        proDes: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
+        // proDes: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
         isMain: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
         processNo: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
       },
@@ -1180,6 +1180,7 @@ export default {
           _tempId: this.tempId, // 临时唯一标识
           id: null,
           processNo: this.getProcessNo(this.form1.tableData1),
+          isMain:'0'
         });
       }
       if (this.activeName == '2') {
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index 10a5762..decb76c 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -428,7 +428,7 @@
           <el-table-column prop="date" label="图纸尺寸">
             <template #default="scope">
               <el-input
-                v-model="scope.row.toolInfo"
+                v-model="scope.row.toolSize"
                 placeholder="请输入"
                 style="width: 100%"
               ></el-input>