1

lzhe

2024-05-24 c9ce5e7f9a9ef52c66baf4f8a6e8d9e48b7cb251

1

 src/views/console/authority/apiscope.vue

@@ -34,7 +34,7 @@
            </el-table>
        </div>
        <el-drawer :title="'当前选中菜单路径'+drawerPath" v-model="drawer" :direction="direction" :before-close="handleClose" size="780" class="drawerClass">
            <el-form :inline="true" :model="drawerSearchData" abel-width="120px">
            <el-form :inline="true" :model="drawerSearchData" label-width="120px">
                <el-form-item label="接口模块">
                    <el-select v-model="drawerSearchData.moduleCode" style="width: 100%">
                        <el-option v-for="item in aList" :key="item.id" :label="item.title" :value="item.id"/>

 src/views/console/authority/datascope.vue

@@ -8,7 +8,7 @@
-->
<template>
    <div class="dict-main">
        <el-form :inline="true" :model="searchData" abel-width="120px">
        <el-form :inline="true" :model="searchData" label-width="120px">
            <el-form-item label="菜单名称">
                <el-input v-model="searchData.name" placeholder="菜单名称" clearable />
            </el-form-item>
@@ -56,7 +56,7 @@
            </div>
        </div>
        <el-drawer title="[控制中心]数据权限配置" v-model="drawer" :direction="direction" :before-close="handleClose" size="920" class="drawerStyle">
            <el-form :inline="true" :model="drawerSearchData" abel-width="120px">
            <el-form :inline="true" :model="drawerSearchData" label-width="120px">
                <el-form-item label="菜单名称">
                    <el-input v-model="drawerSearchData.scopeName" placeholder="菜单名称" clearable />
                </el-form-item>

 src/views/console/base/code-rules.vue

@@ -37,7 +37,7 @@
            </el-table>
        </div>
        <el-drawer :title="'当前选中菜单路径'+drawerPath" v-model="drawer" :direction="direction" :before-close="handleClose" size="780" class="drawerClass">
            <el-form :inline="true" :model="drawerSearchData" abel-width="120px">
            <el-form :inline="true" :model="drawerSearchData" label-width="100px">
                <el-form-item label="接口模块">
                    <el-select v-model="drawerSearchData.moduleCode" style="width: 100%">
                        <el-option v-for="item in aList" :key="item.id" :label="item.title" :value="item.id"/>

 src/views/console/product-process/process-route/addWorking.vue

@@ -13,10 +13,10 @@
        </div>
        <el-table ref="multipleTableRef" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="handleSelectionChange">
            <el-table-column type="selection" width="55" />
            <el-table-column prop="postCode" label="工序编号"></el-table-column>
            <el-table-column prop="postName" label="工序名称"></el-table-column>
            <el-table-column prop="postName" label="工种"></el-table-column>
            <el-table-column prop="postName" label="工序描述"></el-table-column>
            <el-table-column prop="code" label="工序编号"></el-table-column>
            <el-table-column prop="name" label="工序名称"></el-table-column>
            <el-table-column prop="typeName" label="工种"></el-table-column>
            <el-table-column prop="description" label="工序描述"></el-table-column>
        </el-table>
        <el-pagination
            style="margin-top: 12px;"
@@ -57,9 +57,6 @@
        mounted() {
        },
        methods: {
            workingSubmit() {

            },
            addWorking() {
                this.$router.push({path: `/console/basic-data/work-process`});
            },
@@ -70,6 +67,7 @@
                this.$HTTP.get(`/api/blade-cps/process/page?current=${this.current}&size=${this.size}&keyword=`).then(res=> {
                    if(res.code == 200) {
                        this.tableData = res.data.records;
                        this.totle = res.data.total;
                    }
                })
            },
@@ -82,24 +80,10 @@
            },
            //表单提交方法
            workingSubmit(){
                var obj = Object.assign({},this.addWorkingForm);
                this.$refs.dialogForm.validate(async (valid) => {
                    if (valid) {
                        this.isSaveing = true;
                        this.$HTTP.put("/api/blade-cps/craft-routing/update",obj).then(res=> {
                            this.isSaveing = false;
                            if(res.code == 200) {
                                this.$emit('success', this.addWorkingForm, this.mode);
                this.$emit('success', this.selection, this.mode);
                                this.visible = false;
                                this.$message.success("操作成功");
                            }else {
                                this.$alert(res.message, "提示", {type: 'error'});
                            }
                        })
                    }else{
                        return false;
                    }
                })
                this.selection = [];
            },
            //表单注入数据
            setData(data,res){

 src/views/console/product-process/process-route/addWorkmanship.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,182 @@
<!--
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-05-24 11:25:26
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-05-24 15:24:10
 * @FilePath: /src/views/console/product-process/process-route/addWorking.vue
 * @Description: è¿™æ˜¯é»˜è®¤è®¾ç½®,请设置`customMade`, æ‰“å¼€koroFileHeader查看配置 è¿›è¡Œè®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
    <el-form :inline="true" :model="workmanshipForm" :rules="workmanshipRules" label-width="80px" class="form-view-data">
        <el-row>
            <el-col :span="24">
                <el-form-item label="工序编号" prop="test0">
                    <el-select v-model="workmanshipForm.test0" style="width: 100%" placeholder="工序编号">
                        <el-option v-for="item in testList" :key="item.id" :label="item.name" :value="item.id"/>
                    </el-select>
                </el-form-item>
            </el-col>
            <el-col :span="24">
                <el-form-item label="工序名称">
                    <el-select v-model="workmanshipForm.test0" style="width: 100%" placeholder="工序名称">
                        <el-option v-for="item in testList" :key="item.id" :label="item.name" :value="item.id"/>
                    </el-select>
                </el-form-item>
            </el-col>
            <el-col :span="24">
                <el-form-item label="工种">
                    <span>-</span>
                </el-form-item>
            </el-col>
            <el-col :span="24">
                <el-form-item label="工序顺序" prop="test0">
                    <el-input-number v-model="workmanshipForm.num" :min="1" :max="10" @change="handleChange" />
                </el-form-item>
            </el-col>
            <el-col :span="24">
                <el-form-item label="标准用时">
                    <el-input v-model="workmanshipForm.test" style="width: 20%;margin-right: 12px;">
                        <template #suffix>天</template>
                    </el-input>
                    <el-input v-model="workmanshipForm.test" style="width: 20%;margin-right: 12px;">
                        <template #suffix>时</template>
                    </el-input>
                    <el-input v-model="workmanshipForm.test" style="width: 20%;margin-right: 12px;">
                        <template #suffix>分</template>
                    </el-input>
                    <el-input v-model="workmanshipForm.test" style="width: 20%;">
                        <template #suffix>秒</template>
                    </el-input>
                </el-form-item>
            </el-col>
            <el-col :span="8">
                <el-form-item label="准备工时">
                    <el-input v-model="workmanshipForm.test">
                        <template #suffix>分</template>
                    </el-input>
                </el-form-item>
            </el-col>
            <el-col :span="8">
                <el-form-item label="装卸工时">
                    <el-input v-model="workmanshipForm.test">
                        <template #suffix>分</template>
                    </el-input>
                </el-form-item>
            </el-col>
            <el-col :span="8">
                <el-form-item label="运输工时">
                    <el-input v-model="workmanshipForm.test">
                        <template #suffix>分</template>
                    </el-input>
                </el-form-item>
            </el-col>
            <el-col :span="12">
                <el-form-item label="加工程序">
                    <el-input v-model="workmanshipForm.test"></el-input>
                </el-form-item>
            </el-col>
            <el-col :span="12">
                <el-form-item label="">
                    <el-checkbox v-model="workmanshipForm.box" label="选择程序文件" size="small"/>
                </el-form-item>
            </el-col>
            <el-col :span="12">
                <el-form-item label="工艺包">
                    <el-tree-select
                        @change = "parentIdChange"
                        default-expand-all
                        v-model="workmanshipForm.test"
                        clearable
                        node-key="id"
                        placeholder="上级产品"
                        ref="parentTree"
                        :data="parentData"
                        check-strictly
                        :props="{ label: 'name' }"
                        style="width:100%;"
                        :render-after-expand="false" />
                </el-form-item>
            </el-col>
            <el-col :span="24">
                <el-form-item label="附件">
                    <span style="cursor: pointer;">+ æ·»åŠ </span>
                </el-form-item>
            </el-col>
            <el-col :span="24">
                <el-form-item label="夹具">
                    <el-button>关联夹具</el-button>
                    <el-button>批量关联</el-button>
                </el-form-item>
            </el-col>
            <el-col :span="24">
                <el-table ref="multipleTableRef" :data="tableDataJQ" border style="width: 100%;margin-bottom:12px;" class="multipleTableRef">
                    <el-table-column prop="code" label="夹具组"></el-table-column>
                    <el-table-column prop="name" label="夹具编号"></el-table-column>
                    <el-table-column prop="typeName" label="夹具名称"></el-table-column>
                    <el-table-column fixed="right" label="操作" width="200px">
                        <template #default="scope">
                            <el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">删除</el-button>
                        </template>
                    </el-table-column>
                </el-table>
            </el-col>
            <el-col :span="24">
                <el-form-item label="刀具">
                    <el-button>关联刀具</el-button>
                    <el-button>批量关联</el-button>
                </el-form-item>
            </el-col>
            <el-col :span="24">
                <el-table ref="multipleTableRef" :data="tableDataDQ" border style="width: 100%;" class="multipleTableRef">
                    <el-table-column prop="code" label="刀具类型"></el-table-column>
                    <el-table-column prop="name" label="刀具型号"></el-table-column>
                    <el-table-column prop="typeName" label="夹具编号"></el-table-column>
                    <el-table-column fixed="right" label="操作" width="200px">
                        <template #default="scope">
                            <el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">删除</el-button>
                        </template>
                    </el-table-column>
                </el-table>
            </el-col>
        </el-row>
    </el-form>
    <div style="margin-top:12px;">
        <el-button>取消</el-button>
        <el-button type="primary">保存</el-button>
    </div>
</template>

<script>
    export default {
        data() {
            return {
                tableDataJQ: [],
                tableDataDQ: [],
                parentData: {},
                testList: [],
                workmanshipForm: {
                    test0: "",
                    test: "",
                    num: null,
                    box: false
                },
                workmanshipRules: {

                },
            }
        },
        mounted() {
        },
        methods: {
            parentIdChange(val) {
				
            },
            table_edit() {

            }
        }
    }
</script>

<style scoped>
</style>

 src/views/console/product-process/process-route/workmanship.vue

@@ -11,45 +11,51 @@
        <div class="main-content-left">
            <div class="info-top-title">工艺路线</div>
            <div style="margin-bottom: 12px;">
                <el-button type="primary">新增</el-button>
                <el-button type="primary" v-if="isCustomization">定版</el-button>
                <el-button type="primary" @click="table_open">新增</el-button>
                <el-button type="primary" v-if="isCustomization" @click="determineVersion">定版</el-button>
                <el-button disabled>并序</el-button>
            </div>
            <el-table ref="multipleTableRef0" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="HandleSelectionChange">
            <el-table ref="multipleTableRef0" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="HandleSelectionChange" @row-click="rowClick">
                <el-table-column type="selection" width="55" />
                <el-table-column prop="name" label="工序顺序"></el-table-column>
                <el-table-column prop="index" label="工序顺序"></el-table-column>
                <el-table-column prop="code" label="工序编号"></el-table-column>
                <el-table-column prop="typeName" label="工序名称"></el-table-column>
                <el-table-column prop="name" label="工序名称"></el-table-column>
                <el-table-column fixed="right" label="操作" width="200px">
                    <template #default="scope">
                        <!-- <el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
                        <el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">刷新</el-button>
                        <el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">删除</el-button> -->
                        <el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
        </div>
        <div class="main-content-right">
            <div class="main-info-title">工序信息</div>
            <div class="addWorking" @click="table_open">添加工序</div>
            <!-- <ul>
            <div class="addWorking" @click="table_open" v-if="!isCustomization">添加工序</div>
            <ul v-if="isCustomization">
                <li>工序编号<span></span></li>
                <li>工序名称<span></span></li>
                <li>工序顺序<span></span></li>
            </ul> -->
            </ul>
        </div>
    </div>
    <save-dialog v-if="dialog.save" ref="saveDialog" @success="addRouteSuccess" @closed="dialog.save=false"></save-dialog>
    <el-drawer v-model="drawer" title="添加工序" direction="rtl" :before-close="handleClose" size="60%" modal-class="viewData">
        <!-- æ–°å¢žè·¯çº¿ -->
        <div class="addworkmanship">
            <add-workmanship></add-workmanship>
        </div>
    </el-drawer>
</template>

<script>
    import addWorkmanship from './addWorkmanship'
    import saveDialog from './addWorking'
    export default {
        name: 'workmanship',
        components: {saveDialog},
        components: {saveDialog,addWorkmanship},
        props: ["isCustomization"],
        data() {
            return {
                drawer: false,
                tableData: [],
                selection: [],
                dialog: {
@@ -61,14 +67,56 @@
            
        },
        methods: {
            handleClose() {

            },
            determineVersion() {
                var that = this;
                this.$confirm(`工艺路线定版后，不支持编辑、删除、添加工序，请确认是否定版?`, '', {
                    type: 'warning'
                }).then(() => {
                    // this.$HTTP.delete("/api/blade-cps/production-craft-version/remove/"+that.delIconId).then(res=> {
                    //     if(res.code == 200) {
                    //         that.$message.success("操作成功");
                    //         that.getDetail();
                    //     }
                    // })
                }).catch(() => {

                })
            },
            rowClick(row, column, event) {
                // this.id = row.id;
                // this.getWorkDetail();
                // this.getPage1();
            },
            table_edit(row,index) {
                this.$confirm(`确认要删除此工序吗?`, '', {
                    type: 'warning'
                }).then(() => {
                    this.tableData.splice(index,1);
                }).catch(() => {

                })
            },
            addRouteSuccess(selection) {
                selection.forEach((item,i)=> {
                    item.index = i+1;
                })
                this.tableData = selection;
            },
            HandleSelectionChange(selection) {
                this.selection = selection;
            },
            table_open() {
                if(this.isCustomization) {  //首页的新建
                    this.drawer = true;
                }else {  //版本步骤中的新建
                this.dialog.save = true
                this.$nextTick(() => {
                    this.$refs.saveDialog.open();
                })
                }
            }
        }
    }
@@ -89,7 +137,7 @@
    color: #333;
}
.main-content-left {
    width: 70%;
    width: 60%;
}
.main-content-right {
    flex: 1;
@@ -120,4 +168,7 @@
    font-size: 14px;
    cursor: pointer;
}
.addworkmanship {
    padding: 0 20px;
}
</style>

 src/views/console/resource/attach.vue

@@ -8,7 +8,7 @@
-->
<template>
    <div class="dict-main">
        <el-form :inline="true" :model="searchData" abel-width="120px">
        <el-form :inline="true" :model="searchData" label-width="80px">
            <el-form-item label="附件域名">
                <el-input v-model="searchData.domainName" placeholder="附件域名" clearable />
            </el-form-item>

 src/views/console/system/allocationDialog.vue

@@ -9,7 +9,7 @@
<template>
    <el-dialog title="字典名称字典配置" v-model="visible" :width="1000" destroy-on-close @closed="$emit('closed')">
        <div class="dict-main">
            <el-form :inline="true" :model="searchData" abel-width="120px">
            <el-form :inline="true" :model="searchData" label-width="80px">
                <el-form-item label="字典编号">
                    <el-input v-model="searchData.code" placeholder="字典编号" clearable />
                </el-form-item>

 src/views/console/system/data-scope-manager.vue

@@ -8,7 +8,7 @@
-->
<template>
    <div class="dict-main">
        <el-form :inline="true" :model="searchData" abel-width="120px">
        <el-form :inline="true" :model="searchData" label-width="80px">
            <el-form-item label="权限名称">
                <el-input v-model="searchData.deptName" placeholder="权限名称" clearable />
            </el-form-item>

 src/views/console/system/dict.vue

@@ -8,7 +8,7 @@
-->
<template>
    <div class="dict-main">
        <el-form :inline="true" :model="searchData" abel-width="120px">
        <el-form :inline="true" :model="searchData" label-width="80px">
            <el-form-item label="字典编号">
                <el-input v-model="searchData.code" placeholder="字典编号" clearable />
            </el-form-item>

 src/views/console/system/menu.vue

@@ -8,7 +8,7 @@
-->
<template>
    <div class="dict-main">
        <el-form :inline="true" :model="searchData" abel-width="80px">
        <el-form :inline="true" :model="searchData" label-width="80px">
            <el-row>
                <el-col :span="6">
                    <el-form-item label="菜单名称">

 src/views/monitor/log/api.vue

@@ -8,7 +8,7 @@
-->
<template>
    <div class="api-main">
        <el-form :inline="true" :model="searchData" abel-width="120px">
        <el-form :inline="true" :model="searchData" label-width="80px">
            <el-form-item label="服务id">
                <el-input v-model="searchData.serviceId" placeholder="服务id" clearable />
            </el-form-item>
@@ -48,7 +48,7 @@
            </div>
        </div>
        <el-drawer v-model="drawer" title="查 çœ‹" direction="rtl" :before-close="handleClose" size="60%" modal-class="viewData">
            <el-form :inline="true" :model="viewData" abel-width="120px" class="form-view-data">
            <el-form :inline="true" :model="viewData" label-width="80px" class="form-view-data">
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="服务id" center>

 src/views/monitor/log/error.vue

@@ -8,7 +8,7 @@
-->
<template>
    <div class="api-main">
        <el-form :inline="true" :model="searchData" abel-width="120px">
        <el-form :inline="true" :model="searchData" label-width="80px">
            <el-form-item label="服务id">
                <el-input v-model="searchData.serviceId" placeholder="服务id" clearable />
            </el-form-item>
@@ -48,7 +48,7 @@
            </div>
        </div>
        <el-drawer v-model="drawer" title="查 çœ‹" direction="rtl" :before-close="handleClose" size="60%" modal-class="viewData">
            <el-form :inline="true" :model="viewData" abel-width="120px" class="form-view-data">
            <el-form :inline="true" :model="viewData" label-width="80px" class="form-view-data">
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="服务id" center>

 src/views/monitor/log/usual.vue

@@ -8,7 +8,7 @@
-->
<template>
    <div class="api-main">
        <el-form :inline="true" :model="searchData" abel-width="120px">
        <el-form :inline="true" :model="searchData" label-width="80px">
            <el-form-item label="服务id">
                <el-input v-model="searchData.serviceId" placeholder="服务id" clearable />
            </el-form-item>
@@ -48,7 +48,7 @@
            </div>
        </div>
        <el-drawer v-model="drawer" title="查 çœ‹" direction="rtl" :before-close="handleClose" size="60%" modal-class="viewData">
            <el-form :inline="true" :model="viewData" abel-width="120px" class="form-view-data">
            <el-form :inline="true" :model="viewData" label-width="80px" class="form-view-data">
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="服务id" center>