Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

Fixiaobai

2023-09-15 0818becbf021341ce369d4f92b2ade3a2648a953

 src/components/view/record-content.vue

@@ -1,113 +1,3 @@
<style scoped>
   .title .el-button {
      height: 32px;
      border: 1px solid rgba(190, 190, 190, 0.44);
      box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
      padding: 0 12px;
   }

   .title {
      margin-bottom: 10px;
      padding: 0 20px;
   }

   .title * {
      font-size: 16px;
   }

   .choose {
      padding: 21px 24px;
      display: flex;
      align-items: center;
      background-color: #fff;
      border-bottom: 3px solid rgb(245, 247, 251);
   }

   .choose * {
      font-size: 14px;
   }

   .choose .el-button {
      height: 32px;
      border: 1px solid rgba(190, 190, 190, 0.44);
      box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
      padding: 0 12px;
   }

   .thing {
      width: 100%;
      height: calc(100% - 120px);
      background-color: #fff;
      display: flex;
   }

   .thing .left {
      width: 295px;
      height: calc(100% - 20px);
      border-right: 3px solid rgb(245, 247, 251);
      padding: 16px;
      overflow-y: auto;
   }

   .thing .left .custom-tree-node span {
      font-size: 14px;
   }

   .thing .left .custom-tree-node {
      flex: 1;
      display: flex;
      align-items: center;
      justify-content: space-between;
      font-size: 14px;
      padding-right: 8px;
   }

   .node_i {
      color: orange;
   }

   .el-icon-delete {
      display: none;
      color: #004EA2;
   }

   .custom-tree-node:hover .el-icon-delete {
      display: inline;
   }

   .thing .right {
      width: calc(100% - 305px);
      height: calc(100% - 25px);
      overflow: hidden;
      padding: 10px;
   }

   .table_do {
      color: #004ea0;
      cursor: pointer;
   }
</style>
<style>
   .record_content .title .el-button * {
      font-size: 14px;
   }

   .record_content .title .el-button--default {
      color: #004EA2;
   }

   .record_content .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
      background: rgba(58, 124, 253, 0.2);
      color: #004EA2;
   }

   .record_content .el-tree-node__content {
      height: 30px;
      border-radius: 2px;
   }
</style>


<template>
   <div class="record_content">
      <div class="title">
@@ -250,12 +140,14 @@
         </span>
      </el-dialog>
      <!-- 新增弹窗 -->
      <el-dialog title="生产记录新增" :visible.sync="dialogVisible" width="35%">
      <el-dialog title="生产记录新增" :visible.sync="dialogVisible" :rules="Rules"
      ref="ruleForm" width="35%">
         <div>
            <el-form ref="form" :model="form" label-width="80px">
            <el-form-item label="类型">
            <el-form-item label="类型" prop="type">
               <template>
                        <el-select v-model="form.type"  @change="edittype" placeholder="请选择" style="width: 480px;">
                        <el-select v-model="form.type"  
                  @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>
@@ -263,7 +155,7 @@
                        </el-select>
                        </template>
            </el-form-item>
            <el-form-item label="工序">
            <el-form-item label="工序" prop="work">
               <template>
                        <el-select v-model="form.work"
                  @change="workevent"
@@ -277,7 +169,7 @@
                        </el-select>
                        </template>
            </el-form-item>
            <el-form-item label="工艺名称">
            <el-form-item label="工艺名称" prop="name">
               <template>
                        <el-select v-model="form.craft" placeholder="请选择" style="width: 480px;">
                            <el-option
@@ -289,19 +181,19 @@
                        </el-select>
                        </template>
            </el-form-item>
            <el-form-item label="记录">
            <el-form-item label="记录" prop="record">
               <el-input v-model="form.record"></el-input>
            </el-form-item>
            <el-form-item label="备注">
               <el-input v-model="form.remarks"></el-input>
            </el-form-item>
            <el-form-item label="单位">
            <el-form-item label="单位" prop="unit">
               <el-input v-model="form.unit"></el-input>
            </el-form-item>
            </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>
@@ -368,7 +260,14 @@
<script>
   export default {
      data() {
         return {
         var checktype = (rule, value, callback) => {
                 if (!value) {
                return callback(new Error('类型不能为空'));
              }else{
               return callback
            }
         };
         return {	
            search: {
               type: 0,
               technology: null
@@ -384,6 +283,13 @@
               record:'',
               remarks:'',
               unit:'',
            },
            Rules:{
               type:{validator:checktype,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,
@@ -468,9 +374,17 @@
               this.selectjilu()
            })
         },
         add() {
         add(formName) {
            this.dialogVisible = false
            this.addRecord()
            // this.$refs[formName].validate((valid) => {
            // if (valid) {
            //    alert('submit!');
            // } else {
            //    console.log('error submit!!');
            //    return false;
            // }
            // });
            this.form = {};
         },
         query() {
@@ -494,6 +408,7 @@
         console.log(one);
         let name=one.children[0].id
         console.log(name);
         this.checkTreeNode.id = name
         this.selectjiluStart(name)
         this.selectDataList();
         });
@@ -509,6 +424,7 @@
         },
         //selectjilu  checkTreeNode
         selectjilu() {
            console.log(this.checkTreeNode.id);
         this.$axios.get(this.$api.url.selectjilu,{
            params:{id:this.checkTreeNode.id}
         }).then(res => {
@@ -654,3 +570,114 @@
      }
   }
</script>

<style scoped>
   .title .el-button {
      height: 32px;
      border: 1px solid rgba(190, 190, 190, 0.44);
      box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
      padding: 0 12px;
   }

   .title {
      margin-bottom: 10px;
      padding: 0 20px;
   }

   .title * {
      font-size: 16px;
   }

   .choose {
      padding: 21px 24px;
      display: flex;
      align-items: center;
      background-color: #fff;
      border-bottom: 3px solid rgb(245, 247, 251);
   }

   .choose * {
      font-size: 14px;
   }

   .choose .el-button {
      height: 32px;
      border: 1px solid rgba(190, 190, 190, 0.44);
      box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
      padding: 0 12px;
   }

   .thing {
      width: 100%;
      height: calc(100% - 120px);
      background-color: #fff;
      display: flex;
   }

   .thing .left {
      width: 295px;
      height: calc(100% - 20px);
      border-right: 3px solid rgb(245, 247, 251);
      padding: 16px;
      overflow-y: auto;
   }

   .thing .left .custom-tree-node span {
      font-size: 14px;
   }

   .thing .left .custom-tree-node {
      flex: 1;
      display: flex;
      align-items: center;
      justify-content: space-between;
      font-size: 14px;
      padding-right: 8px;
   }

   .node_i {
      color: orange;
   }

   .el-icon-delete {
      display: none;
      color: #004EA2;
   }

   .custom-tree-node:hover .el-icon-delete {
      display: inline;
   }

   .thing .right {
      width: calc(100% - 305px);
      height: calc(100% - 25px);
      overflow: hidden;
      padding: 10px;
   }

   .table_do {
      color: #004ea0;
      cursor: pointer;
   }
</style>
<style>
   .record_content .title .el-button * {
      font-size: 14px;
   }

   .record_content .title .el-button--default {
      color: #004EA2;
   }

   .record_content .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
      background: rgba(58, 124, 253, 0.2);
      color: #004EA2;
   }

   .record_content .el-tree-node__content {
      height: 30px;
      border-radius: 2px;
   }
</style>