zouyu
2023-09-14 dacb1dd4fefa18fe0199000bc693d8f61a3bd70b
Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
已修改8个文件
115 ■■■■■ 文件已修改
src/components/view/finishedProductInspectionUp.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/processInspection.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/processInspectionLook.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/processInspectionUpdate.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/rawInsBox.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/rawInsDetail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/standard.vue 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/technical.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/finishedProductInspectionUp.vue
@@ -323,6 +323,13 @@
                id: this.detailId
            }).then(res => {
                if (res.code == 200) {
                    if(res.message==='项目未检验完!'){
                        this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                    return
                    }
                    this.$message({
                        message: '上报成功',
                        type: 'success'
src/components/view/processInspection.vue
@@ -81,7 +81,7 @@
            <!-- 点击返回,当前页面值为false -->
            <el-button type="primary" size="mini" style="background: #004EA2; "
              icon="el-icon-circle-plus-outline">新增</el-button>
            <el-button @click="showAddPage = false" type="primary" size="mini" icon="el-icon-back"
            <el-button @click="combackIndex" type="primary" size="mini" icon="el-icon-back"
              style="background: #004EA2; ">返回</el-button>
          </el-col>
        </el-row>
@@ -171,7 +171,7 @@
            > -->
          </el-col>
        </el-row>
        <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
        <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
          style="width: 100%">
          <el-table-column type="index" label="序号" width="60"></el-table-column>
          <el-table-column label="项目" prop="father"></el-table-column>
@@ -355,6 +355,10 @@
      this.rowInfp=row
      this.showLook=true
    },
    combackIndex(){
      this.showAddPage=false
      this.defaultInitializationTable()
    },
    updateInsInfo(row){
      this.rowInfp=row
      this.showUp=true
src/components/view/processInspectionLook.vue
@@ -103,7 +103,7 @@
            > -->
                </el-col>
            </el-row>
            <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
            <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
                style="width: 100%">
                <el-table-column type="index" label="序号" width="60"></el-table-column>
                <el-table-column label="项目" prop="father"></el-table-column>
src/components/view/processInspectionUpdate.vue
@@ -103,7 +103,7 @@
            > -->
                </el-col>
            </el-row>
            <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
            <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
                style="width: 100%">
                <el-table-column type="index" label="序号" width="60"></el-table-column>
                <el-table-column label="项目" prop="father"></el-table-column>
@@ -323,8 +323,14 @@
            this.$axios.post(this.$api.url.processInspectUpdateProcessInspectsById, {
                id: this.detailId
            }).then(res => {
                console.log(res);
                if (res.code == 200) {
                    if(res.message==='项目未检验完!'){
                        this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                    return
                    }
                    this.$message({
                        message: '上报成功',
                        type: 'success'
src/components/view/rawInsBox.vue
@@ -30,6 +30,7 @@
            console.log(this.id)
        },
        goBack() {
            this.$parent.removeAllTab()
            this.showDetail = false
        }
    }
src/components/view/rawInsDetail.vue
@@ -488,9 +488,9 @@
      const res = await this.$axios.post(
        this.$api.url.updateRawInspectsById + `${this.detailId}`
      ).then(res=>{
        this.$parent.removeAllTab()
        this.$message.success("提交成功");
        this.getDetailInfo();
        this.goBack()
      });
    },
    // 获取设备树内容
src/components/view/standard.vue
@@ -13,14 +13,15 @@
    </div>
    <div class="thing">
      <div class="left">
        <el-row :gutter="5">
        <el-row :gutter="5" style="position: fixed;top: 148px;z-index: 1;">
          <el-col :span="21">
            <el-input v-model="search" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable></el-input>
          </el-col>
          <el-col :span="2">
            <el-button size="small" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
            <el-button size="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
          </el-col>
        </el-row>
        <el-row style="margin-top: 16px;">
        <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
          node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
          <div class="custom-tree-node" slot-scope="{ node, data }">
@@ -31,6 +32,7 @@
            </el-button>
          </div>
        </el-tree>
        </el-row>
      </div>
      <div class="right">
        <div class="choose">
@@ -530,7 +532,26 @@
        this.$refs[formName].validate((valid) => {
          if (valid) {
            let obj=JSON.parse(JSON.stringify(this.leftAdd))
            console.log(obj);
            if(obj.type.length===1){
              obj.type=this.getType(obj.type[0])
                  this.$axios.post(this.$api.url.leftAddOneTwo,obj,{
                     headers: { "Content-Type": "application/json" }
                 }).then(res=>{
                     this.$message({
                      message: res.message,
                      type: 'success'
                      });
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false
                      this.selectVersion()
                  })
                  return
            }
            let one=this.list.filter(item=>{
                return item.name===obj.type[0]
              })[0]
@@ -548,7 +569,14 @@
                      message: res.message,
                      type: 'success'
                      });
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()   
                      this.bomLeftAdd=false
                      this.selectVersion()
                  })
              }else{
                let three=two.children.filter(item=>{
@@ -564,7 +592,14 @@
                      message: res.message,
                      type: 'success'
                      });
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()   
                      this.bomLeftAdd=false
                      this.selectVersion()
                  })
                }else{
                  //新增标准型号
@@ -584,7 +619,14 @@
                      message: res.message,
                      type: 'success'
                      });
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()   
                      this.bomLeftAdd=false
                      this.selectVersion()
                   })
                  }else{
                     let specificationsDto={
@@ -598,7 +640,13 @@
                      message: res.message,
                      type: 'success'
                      });
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false
                      this.selectVersion()
                   })
                  }
@@ -1039,6 +1087,29 @@
            arr[idx].name = '半成品'
          }
        })
        if(res.data.length<1){
          let obj={
            name: '成品',
          }
          let obj2={
            name: '半成品',
          }
          this.list.push(obj)
          this.list.push(obj2)
        }
        if(res.data.length===1){
          if(res.data[0].name==='成品'){
            this.list.push({
            name: '半成品',
          })
          }
          if(res.data[0].name==='半成品'){
            this.list.push({
            name: '成品',
          })
          }
        }
        console.log(this.list);
        this.selectDataList()
        // 默认第一个五级节点搜索,新增配置项
        const treeOptions = JSON.parse(JSON.stringify(this.list));
@@ -1136,12 +1207,16 @@
    handler(newVal, oldVal) {
    if(this.isLeftAdd){
      let tree=JSON.parse(JSON.stringify(this.list))
      console.log(tree);
      let father=null;
      if(newVal.father!=null&&newVal.father!=''&&newVal.type.length>0){
          let one=tree.filter(item=>{
            return item.name===newVal.type[0]
          })[0]
          console.log(one);
          if(one.children===undefined){
            return
          }
          let two=one.children.filter(item=>{
            return item.name===newVal.father
          })[0]
src/components/view/technical.vue
@@ -99,7 +99,7 @@
              <template slot-scope="scope">
                <!-- <el-button type="text" size="small" @click="showDetails(scope.row)">查看详情</el-button>
                <el-button type="text" size="small">编辑附件</el-button> -->
                <el-button type="text" size="small" @click="authorizedstrength(scope.row)">编制</el-button>
                <el-button v-if="scope.row.type===0" type="text" size="small" @click="authorizedstrength(scope.row)">编制</el-button>
              </template>
            </el-table-column>
      </el-table>
@@ -262,8 +262,8 @@
              id:this.compiledata.id
        }).then( res =>{
        this.$message.success('编制完成')
      })
        this.getTechnicalTableData()
      })
      },
      async showDetails(row){