王震
2023-09-14 87579d3017141b6c183a8c31eed34772ac5551b4
改bug
已修改4个文件
161 ■■■■ 文件已修改
src/components/view/Technicalindex.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/equipmentmaintain.vue 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/record-content.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/technology.vue 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/Technicalindex.vue
@@ -222,7 +222,7 @@
                                <el-col :span="11" :offset="2">
                                    <el-form-item label="工艺">
                                        <template>
                                            <el-select v-model="form.name" placeholder="请选择" allow-create filterable>
                                            <el-select v-model="form.name" placeholder="请选择" @change="craftrow" allow-create filterable>
                                                <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
                                                </el-option>
                                            </el-select>
@@ -309,6 +309,7 @@
                modifyevent:false,
                dialogVisible:false,
                tableData: [],
                crafval:'',
                typeselect:0,
                upData:{},
                upDia:false,
@@ -522,6 +523,7 @@
                    })[0]
                    console.log(one);
                    let name = one.children[0].id
                    this.checkTreeNode.id = name
                    console.log(name);
                    this.selectAllrightStart(name)
                    this.selectDataList();
@@ -553,12 +555,16 @@
                    console.log(this.tableData);
                });
            },
            craftrow(val){
                this.crafval = val
                this.chooseProFath()
            },
            //上级
            chooseProFath() {
                console.log(this.checkTreeNode.id);
                this.$axios.get(this.$api.url.chooseProFath, {
                    params: {
                        techTemId: this.checkTreeNode.id
                        techTemId:this.crafval
                    }
                }).then(res => {
                    this.higherlevel = res.data;
src/components/view/equipmentmaintain.vue
@@ -108,7 +108,7 @@
            <!-- 新增弹窗 -->
        <div>
            <el-dialog
            title="技术指标新增"
            title="生产工艺新增"
            :visible.sync="dialogVisible"
            width="40%">
            <el-form ref="form" :model="form" label-width="80px">
@@ -141,7 +141,7 @@
                    <el-col :span="11" :offset="2">
                        <el-form-item label="工艺名称">
                            <template>
                        <el-select v-model="form.craft" placeholder="请选择" >
                        <el-select v-model="form.craft" @change="carftapi" placeholder="请选择" >
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
@@ -369,6 +369,7 @@
                tableData: [],
                higherlevel:{},
                quota:{},
                carftrow:"",
                unitrow:'',
            }
            
@@ -398,27 +399,25 @@
            // //新增
            choosePro() {//项目
            this.$axios.get(this.$api.url.choosePro,{
                params:{techTemId:this.checkTreeNode.id}
                params:{techTemId:this.carftrow}
            }).then(res => {
                this.project = res.data;
                console.log(this.process);
            }, {
                headers: {
                        "Content-Type": "application/json"
                      }
            })
            })
            },
            carftapi(val) {
                console.log(val);
                this.carftrow = val
                this.chooseDeiv()
                this.choosePro()
            },
            chooseDeiv() {//设备
            this.$axios.get(this.$api.url.chooseDeiv,{
                params:{techTemId:this.checkTreeNode.id}
                params:{techTemId:this.carftrow}
            }).then(res => {
                this.higherlevel = res.data;
                console.log(this.process);
            }, {
                headers: {
                        "Content-Type": "application/json"
                      }
            })
            })
            },
            //新增
            edittype(val) {
@@ -539,9 +538,26 @@
                this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 默认选中节点第一个
            })
                let one=this.list.filter(item=>{
                return item.children.length>0
                })[0]
                console.log(one);
                let name=one.children[0].id
                console.log(name);
                this.checkTreeNode.id = name
                this.selectAllTequeStart(name)
                this.selectDataList();
            })
            },
            selectAllTequeStart(name) {
            this.$axios.get(this.$api.url.selectAllTeque,{
                params:{id:this.checkTreeNode.id}
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);
                this.formatData(res.data)
            })
            },
            //主体右
            selectAllTeque() {
            this.$axios.get(this.$api.url.selectAllTeque,{
src/components/view/record-content.vue
@@ -140,12 +140,13 @@
            </span>
        </el-dialog>
        <!-- 新增弹窗 -->
        <el-dialog title="生产记录新增" :visible.sync="dialogVisible" width="35%">
        <el-dialog title="生产记录新增" :visible.sync="dialogVisible" ref="ruleForm" width="35%">
            <div>
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                    <template>
                        <el-select v-model="form.type"  @change="edittype" placeholder="请选择" style="width: 480px;">
                        <el-select v-model="form.type"  :rules="Rules"
                        @change="edittype" placeholder="请选择" style="width: 480px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -191,7 +192,7 @@
                </el-form>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button type="primary" @click="add">确 定</el-button>
                <el-button type="primary" @click="add(form)">确 定</el-button>
                <el-button @click="dialogVisible = false">取 消</el-button>
            </span>
        </el-dialog>
@@ -274,6 +275,13 @@
                    record:'',
                    remarks:'',
                    unit:'',
                },
                Rules:{
                    type:{required:true,message:'类型不能为空',trigger:'change'},
                    work:{required:true,message:'工序不能为空',trigger:'change'},
                    name:{required:true,message:'工艺不能为空',trigger:'change'},
                    record:{required:true,message:'记录不能为空',trigger:'blur'},
                    unit:{required:true,message:'单位不能为空',trigger:'blur'},
                },
                modifyVisible:false,
                dialogVisible:false,
@@ -359,10 +367,21 @@
                })
            },
            add() {
                this.$refs[formName].validate((valid) => {
                if (valid) {
                    alert('submit!');
                } else {
                    console.log('error submit!!');
                    return false;
                }
                });
                this.dialogVisible = false
                this.addRecord()
                this.form = {};
            },
            resetForm(formName) {
                this.$refs[formName].resetFields();
              },
            query() {
                this.selectAllleft()
            },
src/components/view/technology.vue
@@ -187,7 +187,7 @@
                    : 'el-icon-tickets'
                }`"
              ></i>
              {{data.code}}{{ data.name }}</span
              {{ data.father }}</span
            >
            <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
@@ -209,6 +209,11 @@
          </el-table-column>
          <el-table-column prop="name" label="工艺名称"> </el-table-column>
          <el-table-column prop="device_group" label="设备组">
          </el-table-column>
          <el-table-column label="元件">
            <template slot-scope="scope">
              <el-tag type="info" style="margin-right: 10px;" v-for="(a, index) in JSON.parse(scope.row.element)" :key="index">{{ a }}</el-tag>
            </template>
          </el-table-column>
          <el-table-column label="操作" width="130">
            <template slot-scope="scope">
@@ -396,7 +401,8 @@
            <el-col :span="10">
              <el-form-item label="元件">
                <template>
                  <el-select
                  <el-input v-model="form.elementId" placeholder="请输入元件名称" style="width: 200px"></el-input>
                  <!-- <el-select
                    v-model="form.elementId"
                    multiple
                    placeholder="请选择"
@@ -409,7 +415,7 @@
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
                  </el-select> -->
                </template>
              </el-form-item>
            </el-col>
@@ -565,16 +571,16 @@
        type: "",
      },
      upIndex: 0,
      treeList:[]
      treeList:[],
    elerow:{},
    };
  },
  mounted() {
    this.selectAllTechTem();
    this.chooseTech();
    this.chooseDevGroup();
    this.chooseElement();
    this.selectAllTechNam();
    console.log(this.treeList);
  },
  methods: {
    selectDataList() {
@@ -605,14 +611,17 @@
      this.form = {};
    },
    addTechTemp() {
      // console.log(this.$api.url.addTechTemp);
      console.log(this.form.elementId.split(','));
      this.$axios
        .post(
          this.$api.url.addTechTemp,
          {
            deviceGroup: this.form.deviceGroup,
            elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
            // elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
            // element:this.form.elementId.split(','),
            element:JSON.stringify(this.form.elementId.split(',')),
            father: this.form.father,
            name: this.form.name,
            type: this.form.type,
@@ -632,12 +641,12 @@
    },
    //元件
    chooseElement() {
      this.$axios.get(this.$api.url.chooseElement).then((res) => {
        this.element = res.data;
        console.log(this.element);
      });
    },
    // chooseElement() {
    //   this.$axios.get(this.$api.url.chooseElement).then((res) => {
    //     this.element = res.data;
    //     console.log(this.element);
    //   });
    // },
    //设备
    chooseDevGroup() {
      this.$axios.get(this.$api.url.chooseDevGroup).then((res) => {
@@ -722,33 +731,47 @@
          this.towTree = res.data;
          console.log(this.towTree);
          this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.towTree[0].children[0].name) // 默认选中节点第一个
                this.$refs.tree.setCurrentKey(this.towTree[0].father) // 默认选中节点第一个
            })
          let one=this.towTree.filter(item=>{
            return item.children.length>0
          })[0]
          let name=one.children[0].name
      this.checkTreeNode.name=name
          this.selectAllTechNamStart(name)
          this.selectDataList();
          // let one=this.towTree.filter(item=>{
            // return item.children.length>0
          // })[0]
          // let name=one.children[0].name
      // this.checkTreeNode.name=name
          // this.selectAllTechNamStart(name)
      //     this.selectDataList();
      let one=this.towTree[0]
        let name =one.father
        this.checkTreeNode.father = name
              console.log(name);
        this.selectAllTechNamStart(name)
        });
    },
    handleNodeClick(data, node) {
        console.log(data);
      this.checkTreeNode = data;
      this.treetrunk = node;
      console.log(this.treetrunk);
      console.log(this.checkTreeNode);
      // this.treetrunk = node;
      // console.log(this.treetrunk);
      // console.log(this.checkTreeNode);
      this.selectAllTechNam();
    },
    selectAllTechNam() {
      this.$axios
        .get(this.$api.url.selectAllTechNam, {
          params: { father: this.checkTreeNode.name },
          params: { father: this.checkTreeNode.father },
        })
        .then((res) => {
          this.tableData = res.data;
          let kk =this.tableData.map(el =>{
            console.log(el);
            return el.element
                })[0]
            // console.log(kk.replace('[','').replace(']','') );
            // console.log(kk.split(','));
            this.elerow = kk
        });
    },
    selectAllTechNamStart(name) {
@@ -762,6 +785,9 @@
    },
    addend() {
      this.dialogVisible = true;
      this.chooseTech();
      this.chooseDevGroup();
      // this.chooseElement();
    },
    modify() {
      this.modifyevent = true;