Merge branch 'master' of http://114.132.189.42:9002/r/mom-before

Fixiaobai

2023-09-24 92f198bd79e26fe1c31541432cf927403ce0e694

Merge branch 'master' of http://114.132.189.42:9002/r/mom-before

 src/components/view/mbom.vue

 src/components/view/processInspection.vue

@@ -8,6 +8,7 @@
            <el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus"
              style="background: #004EA2; ">新增</el-button>
            <el-button icon="el-icon-download" size="mini">导出</el-button>
            <el-button @click="report" icon="el-icon-download" size="mini">生成报告</el-button>
          </el-col>
        </el-row>
      </div>
@@ -241,22 +242,150 @@
    <div class="newPage" v-if="showLook">
      <processInspectionLook :rowInfo="rowInfp" />
    </div>
    <!-- <div class="newPage" v-if="reportlook">
      <index />
    </div> -->
    <el-dialog
     title="过程检验报告" :visible.sync="reportlook"  width="40%">
     <template>
    <div ref="print">
  
      <div style="margin:0 auto;">
          <!-- <div style="text-align:center;margin-top:10px;">过程检验报告</div> -->
    <table class="table table-striped table-bordered" align="center" border style="width: 100%;height: 700px;" valign="center">
      <tr>
        <td class="column" colspan="2" rowspan="2" > <img src="../view/report/logo-2.png" style="width:100%;" /></td>
        <td class="column" colspan="2" ><p>记录名称：检验记录表</p>Table: Inspection Record</td>
        <td class="column" colspan="2"><p>保存期限：25年</p> Storage Life: 25 years</td>
      </tr>
      <tr>
          <td  class="column" colspan="2" > 记录编号</td>
          <td  class="column" colspan="2" > 归档部门</td>
      </tr>
      <tr>
        <td class="column"><p>零件名称</p> Part Description</td>
        <td  class="value"></td>
        <td class="column"><p>型号</p> Model</td>
        <td class="value"></td>
        <td class="column"><p>加工单号</p> Order No</td>
        <td class="value"></td>
      </tr>
      <tr>
        <td class="column"><p>检验仪器</p> Inspection instrument</td>
        <td class="value"></td>
        <td class="column"><p>检验数量</p> Quantity to check</td>
        <td class="value"></td>
        <td class="column"><p>供货单位</p> Supplier</td>
        <td class="value"></td>
      </tr>
      <tr>
        <td class="column"><p>检验项目</p> Inspection Item</td>

        <td class="column" colspan="3"><p><p>检验结果(实测值)</p> Test result (Measured value)</p></td>

        <td class="column" rowspan="2" colspan="2"><p>判定</p> Conclusion</td>
      </tr>
      <tr>
        <td class="column"><p>技术要求</p> Technical Requirement</td>
        <td class="column"><p>公差</p> TOL</td>
        <!-- <td class="daughter" >01</td> -->
      </tr>
      <tr>
        <td class="column"  rowspan="9" colspan="0.5">尺寸</td>
        <td class="value" ></td>
        <td class="column"></td>
        <td class="value" ></td>
  
      </tr>
      <tr>
        <td class="column"></td>
        <td class="value" colspan="3"></td>
        <td class="column"></td>
  
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
  
      <tr>
        <td class="column" colspan="6"></td>
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
      <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
       <tr>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
  
      <tr>
        <td class="column">材质</td>
        <td class="value" colspan="5"></td>
      </tr>
      <tr >
        <td class="column" >外观性能</td>
        <td class="value" colspan="5" style="text-align:left;">
          <br>
          <br>
          <br>
          <br>
        </td>
      </tr>
      <tr>
        <td class="column">备注</td>
        <td class="value" colspan="5">
          <br>
          <br>
          <br>
          <br>
        </td>
      </tr>
  
  
    </table>
      </div>
    </div>
  </template>
    </el-dialog>`
  </div>
</template>

<script>
import processInspectionUpdate from '../view/processInspectionUpdate.vue'
import processInspectionLook from '../view/processInspectionLook.vue'
// import index from '../view/report/index.vue'
export default {
  components: {
    processInspectionUpdate,
    processInspectionLook
    processInspectionLook,
    // index
  },
  data() {
    return {
      showUp: false,
      isAddProject: false,
      showLook: false,
      reportlook: false,
      detailId: 28,
      rowInfp: {},
      search: {
@@ -352,6 +481,12 @@
    // this.getOptions();
  },
  methods: {
    report() {
      this.reportlook = true
      // this.$nextTick(() => {
      //          this.$print(this.$refs.print);
      //      })     
    },
    handleClick(row) {
      this.rowInfp = row
      this.showLook = true
@@ -795,4 +930,40 @@
  float: right;
  font-size: 13px !important;
}

/* .table{
  border-collapse: collapse;
  border-spacing: 0;
  background-color: transparent;
  display: table;
  width: 100%;
  max-width: 100%;
  width: 800px;
  margin:0 auto;
} */
/* .table td{
  text-align:center;
  vertical-align:middle;
  font-size: 14px;
  font-family: 'Arial Normal', 'Arial';
  color: #333333;
  padding: 8px 12px;
} */
/* .table-bordered {
  border: 1px solid #ddd;
}  */
.column{
  width:auto;
  height:30px;
  font-size: 12px;
  text-align:center
  /* border:1px solid #333;
  background: #f1f1f1; */
}
.value{
  width:70px;
  height:30px;
  border:1px solid #333;
}

</style>

 src/components/view/self-inspection.vue

@@ -113,7 +113,6 @@
                <el-col :span="12" style="line-height: 32px;">自检项目维护</el-col>
                <el-col :span="12" style="text-align: right;">
                    <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"  @click="addend">新增</el-button>
                    <!-- <el-button icon="el-icon-edit-outline"  @click="modify">修改</el-button> -->
                    <el-button icon="el-icon-delete" @click="dels">删除</el-button>
                </el-col>
            </el-row>
@@ -121,22 +120,9 @@
        <div class="choose">
            <span>类型：</span>
            <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-option v-for="(a, ai) in bigType" :key="ai" :value="a">
                </el-option>
            </el-select>
            <!-- <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>
            <span>项目：</span>
            <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" type="primary" style="background: #004EA2;"><span>查
                    询</span></el-button> -->
        </div>
        <div class="thing">
            <div class="left">
@@ -147,9 +133,6 @@
                    <div class="custom-tree-node" slot-scope="{ node, data }">
                        <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                            {{data.code}} {{ data.name }}</span>
                        <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
                        </el-button> -->
                    </div>
                </el-tree>
            </div>
@@ -384,6 +367,7 @@
                checkTreeNode: {
                    id:'',
                },
                bigType: [],
                tableData: [],
                upIndex: 0,
                selects: [],
@@ -402,10 +386,20 @@
            }
        },
        mounted() {
            this.chooseType()
            this.selectAllleft()
            this.selectAllSelf()
        },
        methods: {
            chooseType() {
                this.$axios.get(this.$api.url.chooseType).then(res => {
                    this.bigType = res.data
                    this.typeselect = res.data[0]
                    this.search.type = res.data[0]
                    this.selectAllTechTem();
                    this.selectAllTechNam();
                })
            },
             selectDataList() {
                this.list.forEach(a => {
                    a.code = '[1]'

 src/components/view/standard.vue

 src/components/view/technology.vue

 src/view/index.vue

@@ -482,7 +482,13 @@
                                v: "物料清单维护",
                                i: "font icon-shouye",
                                u: "mbom"
                            }
                            },
                            {
                                k: 29,
                                v: "自检项目维护",
                                i: "font icon-shouye",
                                u: "self-inspection"
                            },
                        ]
                    }
                ],