modified: src/views/admin/user/info.vue modified: src/views/quality/p...

zouyu

2023-12-14 419a56790ff55f15d50c3f7e80f29696a7583ac6

	modified:   src/views/admin/user/info.vue
	modified:   src/views/quality/processInspect/processInspect-form.vue

 src/views/admin/user/info.vue

@@ -19,7 +19,7 @@
  <div class="app-container calendar-list-container">
    <basic-container>
      <template>
        <el-tabs @tab-click="switchTab">
        <el-tabs v-model="switchStatus" @tab-click="switchTab" style="padding-left:20px">
          <el-tab-pane label="信息管理" name="userManager"/>
          <el-tab-pane label="密码管理" name="passwordManager"/>
        </el-tabs>
@@ -56,7 +56,7 @@
                  <i v-else class="el-icon-plus avatar-uploader-icon"/>
                </el-upload>
              </el-form-item>
              <el-form-item
              <!-- <el-form-item
                label="社交登录"
                prop="social">
                <a
@@ -71,7 +71,7 @@
                  href="#"
                  style="color: blue"
                  @click="handleClick('osc')">开源中国</a>
              </el-form-item>
              </el-form-item> -->
              <el-form-item>
                <el-button
                  type="primary"

 src/views/quality/processInspect/processInspect-form.vue

@@ -113,7 +113,7 @@
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.empiricalValueAddss[index]"
                                                @blur="changeState(scope.row)" placeholder="请输入检测值"></el-input>
                                                @blur="changeState(scope.row,true)" placeholder="请输入检测值"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.empiricalValueAddss[index]"></span>
                                        </el-tooltip>
@@ -417,7 +417,23 @@
            this.processInspectVo.material = sample.material
            this.technologyList = sample.children
        },
        changeState(row) {
        changeState(row,isChecked) {
            console.log(row);
            const _than = this
            if(isChecked){
                let isNumber = true
                for(var i=0;i<row.empiricalValueAddss.length;i++){
                    let val = row.empiricalValueAddss[i]
                    if(!/^[0-9]*[1-9][0-9]*$/.test(val)){
                        row.empiricalValueAddss[i] = null
                        _than.$message.error("请输入数字")
                        isNumber = false
                    }
                }
                if(!isNumber){
                    return
                }
            }
            if (row.iid != null && row.iid != '') {
                let str = ""
                row.empiricalValueAddss.forEach(e => {
@@ -433,7 +449,6 @@
                    ppid: row.iid,
                    inspectionValue: str,
                    note : row.inote

                }
                updateProcessInsProduct(obj).then(res => {
                    if (res.data.code == 0) {