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

Fixiaobai

2023-09-15 0818becbf021341ce369d4f92b2ade3a2648a953

 src/components/view/record-content.vue

@@ -140,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>
@@ -153,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"
@@ -167,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
@@ -179,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>
@@ -258,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
@@ -274,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,
@@ -358,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() {