王震
2023-09-04 785fd3a05f38d3b3f98698497294866447880a28
基础数据
已修改7个文件
425 ■■■■ 文件已修改
src/assets/api/controller.js 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/mbom.vue 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/record-content.vue 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/self-inspection.vue 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/technology.vue 105 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/api/controller.js
@@ -66,9 +66,18 @@
    chooseElement:"/technologyTemplate/chooseElement",//新增工艺路线-->选择元件
    addTechTemp:"/technologyTemplate/addTechTemp",//新增工艺路线==>新增
    chooseTech:"/technologyTemplate/chooseTech",//新增工艺路线--》选则工序
    writeTechById:"/technologyTemplate/writeTechById",//工艺路线-->编辑
    writeTechById:"/technologyTemplate/writeTechById",//新增工艺路线-->编辑传参
    delTechById:"/technologyTemplate/delTechById",//新增工艺路线==>删除
    selecTechById:"/technologyTemplate/selecTechById",//新增工艺路线--》编辑
    delAllTech:"/technologyTemplate/delAllTech",//批量删除
    selectAllleft:"/technicalModel/selectAllTechTem",//技术指标-->左边
    selectAllright:"/technicalModel/selectAllTechNam",//技术指标--》右边
    chooseProFath:"/technicalModel/chooseProFath",//技术指标---》父类选择
    chooseTechFath:    "/technicalModel/chooseTechFath",// 技术--->工序工艺
    selectAllMbom:"/mbomModel/selectAllMbom",//物料维护--》右边
    selectAllTeque:"/techniqueModel/selectAllTeque",//生产工艺维护---。右边
    selectAllSelf:"/selfcheckModel/selectAllSelf",//自建维护-----》右边
    selectjilu:"/techniqueModel/selectAllTeque",//生产记录维护---》右边
}
const url = {
    enter: "user/enter", //登录
src/components/view/mbom.vue
@@ -101,23 +101,25 @@
        <div class="choose">
            <span>类型:</span>
            <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
            <el-select v-model="search.type" size="small" @change="TYpe" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                <el-option label="橡胶连接器" :value="0"></el-option>
                <el-option label="金属连接器" :value="1"></el-option>
                <el-option label="湿插拔电连接器" :value="2"></el-option>
                <el-option label="分支组件" :value="3"></el-option>
            </el-select>
            <span>原材料名称:</span>
            <!-- <span>原材料名称:</span>
            <el-select v-model="search.name" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select>
            <el-button size="mini"><span>重 置</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>查询</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>查询</span></el-button> -->
        </div>
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable ></el-input>
                <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all>
                <el-tree :data="list" ref="tree"
                :props="{children: 'children',label: 'name'}"
                node-key="id" default-expand-all  @node-click="handleNodeClick" >
                    <div class="custom-tree-node" slot-scope="{ node, data }">
                        <span><i :class="`node_i ${data.code != '[3]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                            {{data.code}} {{ data.name }}</span>
@@ -160,76 +162,56 @@
        data() {
            return {
              search:{},
              list: [{
                    id: 0,
                    name: "原材料",
                    children: [{
                        id: 3,
                        name: "工艺",
                        children: [{
                            id: 6,
                            name: "设备1"
                        }]
                    }]
                }, {
                    id: 1,
                    name: "成品",
                    children: [{
                        id: 4,
                        name: "工艺"
                    }]
                }, {
                    id: 2,
                    name: "半成品",
                    children: [{
                        id: 5,
                        name: "工艺"
                    }]
                }],
              list:[],
                process:[],
                // handleClose:[],
                checkTreeNode:[],
                tableData:[],
                search:{},
                form:{},
                dialogVisible:false,
                tableData: [{
                    id: 1,
                    name: "质量追溯号",
                    unit: "单位",
                    thing: "dajskda",
                    input:'你好1'
                }, {
                    id: 2,
                    name: "作业人员",
                    unit: "单位",
                    thing: "dajskda",
                    input:'你好2'
                }, {
                    id: 3,
                    name: "规格",
                    unit: "单位",
                    thing: "dajskda",
                    input:'你好3'
                }, {
                    id: 4,
                    name: "规格",
                    unit: "单位",
                    thing: "dajskda",
                    input:'你好4'
                }, {
                    id: 5,
                    name: "规格",
                    unit: "单位",
                    thing: "dajskda",
                    input:'你好5'
                }],
                typeselect:0,
                tableData: [],
                input:''
            }
        },
        mounted() {
            this.selectAllleft()
        },
        methods:{
            TYpe(val) {
                this.typeselect = val
                this.selectAllleft()
            },
            //左边
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
                params:{type:this.typeselect}
            }).then(res => {
                this.list = res.data;
            }, {
                headers: {
                        "Content-Type": "application/json"
                      }
            })
            },
            //右边
            selectAllMbom() {
            this.$axios.get(this.$api.url.selectAllMbom,{
                params:{id:this.checkTreeNode.id}
            }).then(res => {
                this.tableData = res.data;
            }, {
                headers: {
                        "Content-Type": "application/json"
                      }
            })
            },
            handleNodeClick(data){
                this.checkTreeNode = data
                console.log(this.checkTreeNode.id);
                this.selectAllMbom()
            },
            handleClose(done) {
                this.$confirm('确认关闭?')
                .then(_ => {
src/components/view/record-content.vue
@@ -121,19 +121,19 @@
        </div>        
        <div class="choose">
            <span>类型:</span>
            <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
            <el-select v-model="search.type" size="small" @change="TYpe" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                <el-option label="橡胶连接器" :value="0"></el-option>
                <el-option label="金属连接器" :value="1"></el-option>
                <el-option label="湿插拔电连接器" :value="2"></el-option>
                <el-option label="分支组件" :value="3"></el-option>
            </el-select>
            <span>工序:</span>
            <!-- <span>工序:</span>
            <el-select v-model="search.name" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select>
            <el-button size="mini" @click="clean()"><span>重 置</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>查
                    询</span></el-button>
                    询</span></el-button> -->
        </div>
        <div class="thing">
            <div class="left">
@@ -329,62 +329,14 @@
                modifyVisible:false,
                dialogVisible:false,
                process: [],
                list: [{
                    id: 0,
                    name: "原材料",
                    children: [{
                        id: 3,
                        name: "工艺",
                        children: [{
                            id: 6,
                            name: "设备1"
                        }]
                    }]
                }, {
                    id: 1,
                    name: "成品",
                    children: [{
                        id: 4,
                        name: "工艺"
                    }]
                }, {
                    id: 2,
                    name: "半成品",
                    children: [{
                        id: 5,
                        name: "工艺"
                    }]
                }],
                list: [],
                checkTreeNode: {},
                tableData: [{
                    id: 1,
                    name: "质量追溯号",
                    unit: "单位",
                    thing: "dajskda"
                }, {
                    id: 2,
                    name: "作业人员",
                    unit: "单位",
                    thing: "dajskda"
                }, {
                    id: 3,
                    name: "规格",
                    unit: "单位",
                    thing: "dajskda"
                }, {
                    id: 4,
                    name: "规格",
                    unit: "单位",
                    thing: "dajskda"
                }, {
                    id: 5,
                    name: "规格",
                    unit: "单位",
                    thing: "dajskda"
                }],
                tableData: [],
                upIndex: 0,
                selects: [],
                typeselect:0,
                upDia: false,
                checkTreeNode:[],
                upData: {
                    id: 0,
                    name: null,
@@ -394,9 +346,32 @@
            }
        },
        mounted() {
            this.selectDataList()
            this.selectAllleft()
        },
        methods: {
            TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllleft()
            },
            //主体左
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
                params:{type:this.typeselect}
            }).then(res => {
                this.list = res.data;
                console.log(this.list);
            })
            },
            //selectjilu  checkTreeNode
            selectjilu() {
            this.$axios.get(this.$api.url.selectjilu,{
                params:{id:this.checkTreeNode.id}
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);
            })
            },
            modify(){
                this.modifyVisible = true
            },
@@ -435,6 +410,7 @@
            },
            handleNodeClick(data) {
                this.checkTreeNode = data
                this.selectjilu()
                if(data.code=='[3]'){
                    console.log(data);
                }
src/components/view/self-inspection.vue
@@ -120,7 +120,7 @@
        </div>
        <div class="choose">
            <span>类型:</span>
            <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
            <el-select v-model="search.type" size="small" @change="TYpe" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                <el-option label="橡胶连接器" :value="0"></el-option>
                <el-option label="金属连接器" :value="1"></el-option>
                <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -164,9 +164,9 @@
                    </el-table-column>
                    <el-table-column prop="unit" label="单位">
                    </el-table-column>
                    <el-table-column prop="stand" label="标准值">
                    <el-table-column prop="required" label="标准值">
                    </el-table-column>
                    <el-table-column prop="ask" label="内控值">
                    <el-table-column prop="internal" label="内控值">
                    </el-table-column>
                    <el-table-column label="操作" width="130">
                        <template slot-scope="scope">
@@ -371,63 +371,14 @@
                dialogVisible:false,
                process: [],
                product: [],
                list: [{
                    id: 0,
                    name: "原材料",
                    children: [{
                        id: 3,
                        name: "工艺"
                    }]
                }, {
                    id: 1,
                    name: "成品",
                    children: [{
                        id: 4,
                        name: "工艺"
                    }]
                }, {
                    id: 2,
                    name: "半成品",
                    children: [{
                        id: 5,
                        name: "工艺"
                    }]
                }],
                list: [],
                checkTreeNode: {},
                tableData: [{
                    id: 1,
                    name: "电缆规格",
                    unit: "dajskda",
                    stand: "12348",
                    ask: "564165"
                }, {
                    id: 2,
                    name: "作业人员",
                    unit: "dajskda",
                    stand: "12348",
                    ask: "564165"
                }, {
                    id: 3,
                    name: "规格",
                    unit: "dajskda",
                    stand: "12348",
                    ask: "564165"
                }, {
                    id: 4,
                    name: "规格",
                    unit: "dajskda",
                    stand: "12348",
                    ask: "564165"
                }, {
                    id: 5,
                    name: "规格",
                    unit: "dajskda",
                    stand: "12348",
                    ask: "564165"
                }],
                tableData: [],
                upIndex: 0,
                selects: [],
                upDia: false,
                typeselect:0,
                checkTreeNode:[],
                upData: {
                    id: 0,
                    name: null,
@@ -438,9 +389,32 @@
            }
        },
        mounted() {
            this.selectDataList()
            this.selectAllleft()
        },
        methods: {
            TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllleft()
            },
            //主体左
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
                params:{type:this.typeselect}
            }).then(res => {
                this.list = res.data;
                console.log(this.list);
            })
            },
            //selectAllSelf   checkTreeNode
            selectAllSelf() {
            this.$axios.get(this.$api.url.selectAllSelf,{
                params:{id:this.checkTreeNode.id}
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);
            })
            },
            modify(){
                this.modifyVisible = true
            },
@@ -474,6 +448,7 @@
            },
            handleNodeClick(data) {
                this.checkTreeNode = data
                this.selectAllSelf()
                if(data.code=='[2]'){
                    console.log(data);
                }
src/components/view/technology.vue
@@ -120,7 +120,7 @@
        </div>
        <div class="choose">
            <span>类型:</span>
            <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
            <el-select v-model="search.type" size="small" placeholder="请选择" @change="type" style="width: 224px;margin-right: 30px;">
                <el-option label="橡胶连接器" :value="0"></el-option>
                <el-option label="金属连接器" :value="1"></el-option>
                <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -134,13 +134,17 @@
            <el-select v-model="search.name" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in product" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select> -->
            <el-button size="mini" @click="clean()"><span>重 置</span></el-button>
            <!-- <el-button size="mini" @click="clean()"><span>重 置</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>查
                    询</span></el-button>
                    询</span></el-button> -->
        </div>
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input>
                <el-input v-model="search.technology" suffix-icon="el-icon-search"
                placeholder="请输入搜索内容" size="small"
                clearable @input="query">
                <!-- clearable @input="(val)=>$refs.tree.filter(val)"> -->
                </el-input>
                <el-tree 
                :data="towTree" ref="tree" 
                :props="{children: 'children',label: 'father'}" 
@@ -170,7 +174,7 @@
                    <el-table-column label="操作" width="130">
                        <template slot-scope="scope">
                            <span class="table_do" @click="upContent(scope.row)">编辑&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                            <span class="table_do" @click="deleteRow(scope.$index, tableData)">删除</span>
                            <span class="table_do" @click="deleteRow(scope.$index, scope.row)">删除</span>
                        </template>
                    </el-table-column>
                </el-table>
@@ -278,7 +282,7 @@
                <el-col :span="10">
                <el-form-item label="元件">
                    <template>
                        <el-select v-model="form.elementId" placeholder="请选择类型" style="width: 200px;" >
                        <el-select v-model="form.elementId" placeholder="请选择类型"  style="width: 200px;" >
                            <el-option
                            v-for="item in element"
                            :key="item.value"
@@ -300,7 +304,7 @@
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button type="primary" @click="Neworder">确 定</el-button>
                <el-button @click="dialogVisible = false">取 消</el-button>
                <el-button @click="Deleteapi">取 消</el-button>
            </span>
        </el-dialog>
        <!-- 工艺路线修改 -->
@@ -387,11 +391,12 @@
                search:{
                    type:'',
                },
                delete:[],
                treetrunk:[],
                process: [],
                product: [],
                procedure:[],
                checkTreeNode:'',
                checkTreeNode:'下料',
                towTree:[],
                value:"",
                modifyevent:false,
@@ -403,6 +408,7 @@
                upDia: false,
                element:[],
                equipment:[0],
                edit:[],
                upData: {
                    name:'',
                    device_group:'',
@@ -410,6 +416,7 @@
                    father:'',
                    type:'',
                },
                typeselect:0,
                newdata:{
                    type:''
                }
@@ -422,10 +429,21 @@
            this.chooseElement()
        },
        methods: {
            type(val){
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllTechTem()
            },
            
            Neworder() {
                this.dialogVisible = false
                this.addTechTemp()
                this.selectAllTechNam()
                // this.form = '';
            },
            Deleteapi() {
                this.dialogVisible = false
                 this.form = '';
            },
            addTechTemp() {
                // console.log(this.$api.url.addTechTemp);
@@ -470,30 +488,48 @@
                    console.log(this.procedure);
                })
            },
            //批量删除
            delAllTech() {
                console.log(this.delete);
                this.$axios.post(this.$api.url.delAllTech,{
                        ids:this.delete
                })
            },
            //删除
            delTechById() {
                console.log(this.$api.url.delTechById,this.upData.id);
                this.$axios.post(this.$api.url.delTechById,{
                    id:this.upData.id
                        id:this.upData.id
                })
            },
            //编辑
            writeTechById() {
                this.$axios.post(this.$api.url.writeTechById,{
                    deviceGroup:this.upData.device_group,
                    elementId:this.upData.ele[0],
                    father:this.upData.father,
                    name:this.upData.name,
                    type:this.upData.type,
                    // id:this.this.upData.id,
                    params:{
                    id:this.upData.id,
                    technologyTemplateDto:{
                        deviceGroup:this.upData.device_group,
                        elementId:this.upData.ele[0],
                        father:this.upData.father,
                        name:this.upData.name,
                        type:this.upData.type
                    }
                    // id:this.upData.id,
                }
                }, {
                    headers: {
                        "Content-Type": "application/json"
                      }
                })
            },
            query(val){
                this.selectAllTechTem()
            },
            selectAllTechTem() {
                console.log(this.typeselect,'222');
            this.$axios.get(this.$api.url.selectAllTechTem,{
                params:{type: 0}
                params:{type: this.typeselect,message:this.search.technology}
            }).then(res => {
                // let list = res.data;
                // list.forEach(i => {
@@ -572,13 +608,46 @@
                        }
                    }
                })
                // console.log(this.selects);
                let cc = this.selects.map(el => {
                    // console.log(el.id);
                    return el.id
                })
                // console.log(this.delete);
                this.delete = cc.join(',')
                console.log(this.delete);
                this.delAllTech()
                // this.delete =
                // console.log('444');
                this.$message.success('删除完成')
            },
            deleteRow(index, rows) {
                rows.splice(index, 1);
                // console.log(rows);
                // rows.splice(index, 1);
                this.tableData.splice(index,1)
                this.upData.id = rows.id
                this.delTechById()
            },
            selecTechById() {
                this.$axios.get(this.$api.url.selecTechById,{
                    params:{
                    id:this.upData.id,
                    }
                }
                // , {
                //     headers: {
                //         "Content-Type": "application/json"
                  //     }
                // }
                ).then(res =>{
                    this.edit = res.data
                    console.log(this.edit);
                })
            },
            //编辑内容
            upContent(ob) {
                this.upData = ob
                this.selecTechById()
                console.log(this.upData);
                this.upDia = true
            },
@@ -593,7 +662,7 @@
                //     }
                // })
                    this.writeTechById()
                this.$message.success('修改成功')
                this.upIndex++
                this.upDia = false
src/main.js
@@ -23,7 +23,9 @@
Vue.use(qs);
Vue.use(api);
const javaApi = 'http://192.168.137.74:8001/'
// const javaApi = 'http://127.0.0.1:8001/'
const javaApi = 'http://192.168.73.249:8001/'
axios.defaults.baseURL = javaApi
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
src/view/index.vue
@@ -447,7 +447,7 @@
                        i: "font icon-shouye",
                        c: [{
                                k: 23,
                                v: "记录内容维护",
                                v: "生产记录维护",
                                i: "font icon-shouye",
                                u: "record-content"
                            },
@@ -481,15 +481,15 @@
                                i: "font icon-shouye",
                                u: "mbom"
                            },
                            {
                                k: 29,
                                v: "巡检项目维护",
                                i: "font icon-shouye",
                                u: "routinginspection"
                            },
                            // {
                            //     k: 29,
                            //     v: "巡检项目维护",
                            //     i: "font icon-shouye",
                            //     u: "routinginspection"
                            // },
                            {
                                k: 30,
                                v: "设备指标维护",
                                v: "生产工艺维护",
                                i: "font icon-shouye",
                                u: "equipmentmaintain"
                            }