From a5dbfba928e0dda3d07d40acb05d94388f7e7be2 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Thu, 21 May 2026 13:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=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/processManagement/procepssPlanning.js |   9 +
 src/views/basicData/components/warehouse.vue  | 313 +++++++++++++-----
 src/views/basicData/js/warehouseMain.js       |  48 +--
 src/views/basicData/warehouseMaintenance.vue  |   2 +-
 .../components/addEditDialog.vue              |   2 +-
 .../otherIssuing/otherIssuingDailog.vue       |   2 +-
 .../processMainte/processPlanning.vue         |  60 +++-
 .../warehouseManagement/materialPreserve.vue  |  69 +---
 .../workwearPlan/index.vue                    |   2 +-
 9 files changed, 293 insertions(+), 214 deletions(-)

diff --git a/src/api/processManagement/procepssPlanning.js b/src/api/processManagement/procepssPlanning.js
index 63a2ee4c..5a87cc6f 100644
--- a/src/api/processManagement/procepssPlanning.js
+++ b/src/api/processManagement/procepssPlanning.js
@@ -39,4 +39,13 @@ export const getPdmDocLink = params => {
     method: 'get',
     params,
   });
+};
+
+// 复制工艺信息  
+export const craftBatchCopy = data => {
+  return request({
+    url: '/blade-desk/dsCraft/craftBatchCopy',
+    method: 'post',
+    data:data,
+  });
 };
\ No newline at end of file
diff --git a/src/views/basicData/components/warehouse.vue b/src/views/basicData/components/warehouse.vue
index 670fef68..b0d74983 100644
--- a/src/views/basicData/components/warehouse.vue
+++ b/src/views/basicData/components/warehouse.vue
@@ -22,104 +22,233 @@
 </template>
 
 <script>
-import {warehouseOption} from "../js/warehouseMain.js"
-import {getWareList,addWare,editWare,deleteWare,getLocationList,delLocation,
-editLocation,getUserByRoleAlias,getWareByUser,getWareSelect,getUserByWare,saveUserWare,getAllUser,
-saveWareUser,getMaterialSelect} from "@/api/storeManagement/warehouseMaintenance";
+// import {warehouseOption} from "../js/warehouseMain.js"
+import {
+  getWareList,
+  addWare,
+  editWare,
+  deleteWare,
+  getLocationList,
+  delLocation,
+  editLocation,
+  getUserByRoleAlias,
+  getWareByUser,
+  getWareSelect,
+  getUserByWare,
+  saveUserWare,
+  getAllUser,
+  saveWareUser,
+  getMaterialSelect,
+} from '@/api/storeManagement/warehouseMaintenance';
 
 export default {
-    data() {
-        return {
-            warehouseOption,
-            data: [],
-            form: {},
-            page: {
-                total: 0,
-                current: 1,
-                size: 10,
+  data() {
+    return {
+      warehouseOption: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        align: 'center',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        viewBtn: false,
+        addBtn: true,
+        delBtn: true,
+        editBtn: true,
+        editBtnIcon: ' ',
+        delBtnIcon: ' ',
+        labelWidth: 120,
+        menu: true,
+        menuWidth: 120,
+        dialogWidth: 920,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: true,
+        gridBtn: false,
+        searchShowBtn: false,
+        showOverflowTooltip: true,
+        searchLabelPosition: 'left',
+        searchLabelWidth: 'auto',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        column: [
+          {
+            label: '库房编码',
+            prop: 'shCode',
+            span: 12,
+            overflow: true,
+            search: true,
+            rules: [
+              {
+                required: true,
+                message: '请输入库房编码',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '库房名称',
+            prop: 'shName',
+            span: 12,
+            overflow: true,
+            search: true,
+          },
+          {
+            label: '类别说明',
+            prop: 'memo',
+            span: 12,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '所属工装类型',
+            prop: 'toolingType',
+            span: 12,
+            type: 'select',
+            overflow: true,
+            search: true,
+            dicUrl: '/api/blade-system/dict/dictionary?code=workwear_type',
+            props: { label: 'dictValue', value: 'dictKey' },
+          },
+          {
+            label: '所属类别',
+            prop: 'type',
+            span: 12,
+            overflow: true,
+            search: true,
+            type: 'select',
+            dicUrl: '/blade-system/dict/dictionary?code=warehouse_category',
+            props: { label: 'dictValue', value: 'dictKey' },
+          },
+          {
+            label: '库房层级',
+            prop: 'shLevel',
+            span: 12,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '保管员',
+            prop: 'saveUser',
+            span: 12,
+            overflow: true,
+            search: true,
+            filterable: true,
+            type: 'select',
+            dicUrl: '/api/blade-system/user/list-all-by-role-alias?roleAlias=保管员',
+            props: {
+              label: 'codeRealName',
+              value: 'id',
+            //   res: 'data',
             },
-            query:{},
-            loading: false,
-        };
+          },
+        ],
+      },
+      data: [],
+      form: {},
+      page: {
+        total: 0,
+        current: 1,
+        size: 10,
+      },
+      query: {},
+      loading: false,
+    };
+  },
+  mounted() {},
+  methods: {
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad();
+      done();
     },
-    mounted() { 
+    searchReset() {
+      this.query = {};
+      this.onLoad();
     },
-    methods:{
-        searchChange(params, done){
-            this.query = params
-            this.page.currentPage = 1;
-            this.onLoad()
-            done()
-        },
-        searchReset(){
-            this.query = {}
-            this.onLoad()
-        },
-        currentChange(currentPage) {
-            this.page.currentPage = currentPage;
-            this.onLoad()
-        },
-        sizeChange(pageSize) {
-            this.page.pageSize = pageSize;
-            this.onLoad()
-        },
-        refreshChange(){
-            this.onLoad()
-        },
-        rowDel(row) {
-            this.$confirm("确定删除此条数据?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                deleteWare({
-                    ids:row.id
-                }).then(res =>{
-                    if(res.data.code == 200){
-                    this.$message.success('删除成功')
-                    this.onLoad()
-                    }
-                }) 
-            }) 
-        },
-        rowSave(row, done, loading){
-            addWare(row).then(res =>{
-            if(res.data.code == 200){
-                this.$message.success('新增成功')
-                done()
-                this.onLoad()
-            }
-            }).catch(() =>{
-            // loading()
-            done()
-            })
-        },
-        rowUpdate(row, index, done, loading) { 
-            console.log('row',row)
-            editWare(row).then(res =>{
-            if(res.data.code == 200){
-                this.$message.success('修改成功')
-                done()
-                this.onLoad()
-            }
-            })
-        },
-        onLoad(){
-            getWareList({
-                current:this.page.currentPage,
-                size:this.page.pageSize,
-                ...this.query
-            }).then(res =>{
-                res.data.data.records.map(item =>{
-                item.type = (item.type || item.type == 0)  ? item.type + '' : item.type
-                item.toolingType = (item.toolingType || item.toolingType == 0)  ? item.toolingType + '' : item.toolingType
-                })
-                this.data = res.data.data.records
-                this.page.total = res.data.data.total;
-            })
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad();
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad();
+    },
+    refreshChange() {
+      this.onLoad();
+    },
+    rowDel(row) {
+      this.$confirm('确定删除此条数据?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        deleteWare({
+          ids: row.id,
+        }).then(res => {
+          if (res.data.code == 200) {
+            this.$message.success('删除成功');
+            this.onLoad();
+          }
+        });
+      });
+    },
+    rowSave(row, done, loading) {
+      addWare(row)
+        .then(res => {
+          if (res.data.code == 200) {
+            this.$message.success('新增成功');
+            done();
+            this.onLoad();
+          }
+        })
+        .catch(() => {
+          // loading()
+          done();
+        });
+    },
+    rowUpdate(row, index, done, loading) {
+      console.log('row', row);
+      editWare(row).then(res => {
+        if (res.data.code == 200) {
+          this.$message.success('修改成功');
+          done();
+          this.onLoad();
         }
-    }
-
+      });
+    },
+    onLoad() {
+      getWareList({
+        current: this.page.currentPage,
+        size: this.page.pageSize,
+        ...this.query,
+      }).then(res => {
+        res.data.data.records.map(item => {
+          item.type = item.type || item.type == 0 ? item.type + '' : item.type;
+          item.toolingType =
+            item.toolingType || item.toolingType == 0 ? item.toolingType + '' : item.toolingType;
+        });
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total;
+      });
+    },
+  },
 };
 </script>
 
diff --git a/src/views/basicData/js/warehouseMain.js b/src/views/basicData/js/warehouseMain.js
index 2de18241..38d00b28 100644
--- a/src/views/basicData/js/warehouseMain.js
+++ b/src/views/basicData/js/warehouseMain.js
@@ -116,32 +116,6 @@ export default {
             search: true,
             type: 'select',
             dicUrl:'/api/blade-system/user/list-all-by-role-alias?roleAlias=保管员',
-            // props:{
-            //     label: 'realName',
-            //     value: 'userName',
-            // },
-            // }
-            // dicData: [
-            //     {
-            //         label: '保管员一',
-            //         value: 1
-            //     },
-            //     {
-            //         label: '保管员二',
-            //         value: 2
-            //     },
-            //     {
-            //         label: '保管员三',
-            //         value: 3
-            //     },
-            // ],
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入保管员',
-            //         trigger: 'blur',
-            //     },
-            // ],
         },
     ],
     'storageSetup': [
@@ -380,27 +354,7 @@ export const warehouseOption = {
             type:'select',
             dicUrl:'/blade-system/dict/dictionary?code=warehouse_category',
             props: { label: 'dictValue', value: 'dictKey' },
-            // dicData:[
-            //     {
-            //         label:'类别一',
-            //         value:1
-            //     },
-            //     {
-            //         label:'类别二',
-            //         value:2
-            //     },
-            //     {
-            //         label:'类别三',
-            //         value:3
-            //     },
-            // ],
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入所属类别',
-            //         trigger: 'blur',
-            //     },
-            // ],
+            
         },
         {
             label: '库房层级',
diff --git a/src/views/basicData/warehouseMaintenance.vue b/src/views/basicData/warehouseMaintenance.vue
index afb9d2e0..52efe1d5 100644
--- a/src/views/basicData/warehouseMaintenance.vue
+++ b/src/views/basicData/warehouseMaintenance.vue
@@ -23,7 +23,7 @@
         v-if="isUser == 1"
         @change="changeUser"
       >
-        <el-option v-for="item in keepList" :key="item.id" :label="item.realName" :value="item.id">
+        <el-option v-for="item in keepList" :key="item.id" :label="item.codeRealName" :value="item.id">
         </el-option>
       </el-select>
       <el-select
diff --git a/src/views/inboundOutboundManagement/components/addEditDialog.vue b/src/views/inboundOutboundManagement/components/addEditDialog.vue
index 73b70237..cf7a1017 100644
--- a/src/views/inboundOutboundManagement/components/addEditDialog.vue
+++ b/src/views/inboundOutboundManagement/components/addEditDialog.vue
@@ -52,7 +52,7 @@
               <el-option
                 v-for="item in keeperList"
                 :key="item.id"
-                :label="item.realName"
+                :label="item.codeRealName"
                 :value="item.id"
               ></el-option>
             </el-select>
diff --git a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
index c09c3afa..ce2629da 100644
--- a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
+++ b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
@@ -47,7 +47,7 @@
               <el-option
                 v-for="(item, index) in userData"
                 :key="item.id"
-                :label="`${item.realName}(${item.workNo})`"
+                :label="`${item.codeRealName}`"
                 :value="item.id"
               />
             </el-select>
diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index 34d73520..b8f28123 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -36,6 +36,14 @@
         :style="{ top: contextMenuTop + 'px', left: contextMenuLeft + 'px' }"
       >
         <div class="context-menu">
+          <el-button
+            link
+            type="primary"
+            @click="handleCopyNode"
+            v-if="contextTreeNode && contextTreeNode.level === 2"
+          >
+            复制
+          </el-button>
           <el-button
             link
             type="danger"
@@ -163,7 +171,6 @@
                   filterable
                   @change="processChange(scope.row, scope.$index)"
                 >
-                
                   <el-option
                     v-for="(item, index) in processSetOption"
                     :key="index"
@@ -499,6 +506,7 @@ import {
 } from '@/api/processManagement/taskProcessing';
 import { getPqList } from '@/api/qualityManagement/remindRedeem/remindRedeem';
 import { getDictionary } from '@/api/system/dict';
+import {craftBatchCopy} from '@/api/processManagement/procepssPlanning';
 export default {
   name: 'CraftIndex',
   components: {},
@@ -981,7 +989,7 @@ export default {
                 return {
                   ...processInfo,
                   id: generateId('process', processInfo.id, processInfo.processNo),
-                  label: processInfo.processNo+'-'+processInfo.processName,
+                  label: processInfo.processNo + '-' + processInfo.processName,
                   level: 3,
                   rawData: {
                     processInfo,
@@ -992,7 +1000,7 @@ export default {
                   // ✅ 子节点（项目）
                   children: (projectList || []).map(project => ({
                     id: generateId('project', project.id, project.projectCode),
-                    label: project.trialNo+'-'+project.projectName || '未知项目',
+                    label: project.trialNo + '-' + project.projectName || '未知项目',
                     level: 4,
                     disabled: true,
                     rawData: project,
@@ -1093,6 +1101,7 @@ export default {
       this.contextNodeData = null;
       this.contextTreeNode = null;
     },
+    // 工艺右键删除
     async handleDeleteNode() {
       if (!this.contextTreeNode) {
         this.closeContextMenu();
@@ -1121,6 +1130,39 @@ export default {
         this.closeContextMenu();
       }
     },
+    // 工艺右键 复制
+    handleCopyNode() {
+      if (!this.contextTreeNode) {
+        this.closeContextMenu();
+        return;
+      }
+
+      const node = this.contextTreeNode;
+      this.$prompt('请输入零件号', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
+        inputErrorMessage: '零件号正确',
+      })
+        .then(({ value }) => {
+          let query = {
+            craftId: node.data.id,
+            partCode: value,
+          };
+
+          console.log(9999999, node.data.id);
+          craftBatchCopy(query).then(res => { 
+            this.$message.success('复制成功');
+          });
+
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消输入',
+          });
+        });
+    },
 
     // 右侧tab切换
     handleClick(value) {
@@ -1181,7 +1223,7 @@ export default {
           _tempId: this.tempId, // 临时唯一标识
           id: null,
           processNo: this.getProcessNo(this.form1.tableData1),
-          isMain:'0'
+          isMain: '0',
         });
       }
       if (this.activeName == '2') {
@@ -1195,11 +1237,13 @@ export default {
         let trialNo_ = '';
         if (this.treeNodes.children.length <= 0) {
           trialNo_ = this.treeNodes.processNo;
-        }else{
-          let projectInfo = this.treeNodes.children.filter(item => item.rawData.projectName.indexOf('尺寸检测')>-1);
-          if(projectInfo.length>0){
+        } else {
+          let projectInfo = this.treeNodes.children.filter(
+            item => item.rawData.projectName.indexOf('尺寸检测') > -1
+          );
+          if (projectInfo.length > 0) {
             trialNo_ = projectInfo[0].rawData.trialNo;
-          }else{
+          } else {
             trialNo_ = this.treeNodes.processNo;
           }
         }
diff --git a/src/views/warehouseManagement/materialPreserve.vue b/src/views/warehouseManagement/materialPreserve.vue
index 08ca02e5..32fd1ecd 100644
--- a/src/views/warehouseManagement/materialPreserve.vue
+++ b/src/views/warehouseManagement/materialPreserve.vue
@@ -116,10 +116,7 @@ export default {
                             value: 'goodsCode',
                             res: 'data.records',
                         },
-                        // onChange:(value =>{
-                        //     let tmp = value.dic.find(item => item.id == value.value)
-                        //     this.form.goodsName = tmp.goodsName
-                        // })
+                        
                     },
                     {
                         label: '物料编码',
@@ -130,7 +127,7 @@ export default {
                         span: 8,
                         width: 200,
                         search: false,
-                        // 
+                        
                         rules: [
                             {
                                 required: true,
@@ -168,49 +165,7 @@ export default {
                         ],
                     },
                     
-                    // {
-                    //     label: '物料标记',
-                    //     prop: 'bsBasicClass',
-                    //     type: 'select',
-                    //     addDisplay: true,
-                    //     editDisplay: true,
-                    //     span: 8,
-                    //     width: 200,
-                    //     search: true,
-                    //     rules: [
-                    //         {
-                    //             required: true,
-                    //             message: '请输入物料标记',
-                    //             trigger: 'click',
-                    //         },
-                    //     ],
-                    //     props: {
-                    //         label: 'name',
-                    //         value: 'code'
-                    //     },
-                    //     dicData: [
-                    //         {
-                    //             "bcId": 49,
-                    //             "code": "11",
-                    //             "deleted": false,
-                    //             "keyValue": 49,
-                    //             "memo": "11",
-                    //             "name": "bj01",
-                    //             "type": 1,
-                    //             "updateTime": null
-                    //         },
-                    //         {
-                    //             "bcId": 69,
-                    //             "code": "bj02",
-                    //             "deleted": false,
-                    //             "keyValue": 69,
-                    //             "memo": "22",
-                    //             "name": "bj02",
-                    //             "type": 1,
-                    //             "updateTime": null
-                    //         }
-                    //     ]
-                    // },
+                    
                     {
                         label: '型号/牌号',
                         prop: 'materialModel',
@@ -251,13 +206,7 @@ export default {
                         span: 8,
                         width: 200,
                         search: false,
-                        // rules: [
-                        //     {
-                        //         required: true,
-                        //         message: '请输入季度月使用量均值',
-                        //         trigger: 'click',
-                        //     },
-                        // ],
+                       
                     },
                     {
                         label: '一级库存',
@@ -339,15 +288,9 @@ export default {
                         search: true,
                         searchLabelWidth: 60,
                         remote: true,
-                        // rules: [
-                        //     {
-                        //         required: true,
-                        //         message: '请输入周转工',
-                        //         trigger: 'click',
-                        //     },
-                        // ],
+                       
                         props: {
-                            label: 'realName',
+                            label: 'codeRealName',
                             value: 'id',
                             res: 'data.records',
                         },
diff --git a/src/views/warehouseManagement/workwearPlan/index.vue b/src/views/warehouseManagement/workwearPlan/index.vue
index 54d29ffd..c5504666 100644
--- a/src/views/warehouseManagement/workwearPlan/index.vue
+++ b/src/views/warehouseManagement/workwearPlan/index.vue
@@ -128,7 +128,7 @@
               <el-option
                 v-for="item in userList"
                 :key="item.id"
-                :label="item.realName"
+                :label="item.codeRealName"
                 :value="item.id"
               ></el-option>
             </el-select>