生产调度修改

zouyu

2024-02-29 363678a54142e62fdd4ca39a0db5c54af1a704dc

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

@@ -3,7 +3,7 @@
    <div class="page-header">
      <div class="header-left">
        <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
        <h2 v-if="resultVal!=null && dataForm.id!=null">查看-原材料检验</h2>
        <h2 v-if="(resultVal!=null && resultVal!='') && dataForm.id!=null">查看-原材料检验</h2>
        <h2 v-else>编辑-原材料检验</h2>
      </div>
      <div class="btn-group header-right">
@@ -32,12 +32,12 @@
                  <el-button
                    slot="append"
                    icon="el-icon-search"
                    :disabled="resultVal!=null"
                    :disabled="(resultVal!=null && resultVal!='')"
                    @click="queryCode"></el-button>
                    <el-button
                    slot="append"
                    icon="el-icon-full-screen"
                    :disabled="resultVal!=null"
                    :disabled="(resultVal!=null && resultVal!='')"
                    @click="Turnonthecamera"></el-button>
                </el-input>
                </el-form-item>
@@ -86,27 +86,32 @@
                </el-col>
                <el-col :span="6">
                  <el-form-item label="数量" prop="number">
                      <el-input v-model="dataForm.number" :disabled="resultVal!=null" />
                      <el-input v-model="dataForm.number" :disabled="(resultVal!=null && resultVal!='')" />
                  </el-form-item>
                </el-col>
            </el-row>
            <el-row>
                <el-col :span="6">
                    <el-form-item label="报检日期" prop="createTime">
                        <el-date-picker
                        :disabled="dataForm.id!=null"
                        v-model="dataForm.createTime"
                        type="datetime"
                        placeholder="报检日期">
                        </el-date-picker>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                  <el-form-item label="报检人" prop="createUser" v-if="dataForm.id!=null">
                        <el-input v-model="dataForm.createUser" disabled />
                  </el-form-item>
                </el-col>
                <el-col :span="6">
                  <el-form-item  prop="projectName" label="项目名称" v-if="dataForm.id!=null">
                    <el-tooltip :disabled="dataForm.projectName==null" :content="dataForm.projectName">
                      <el-input v-model="dataForm.projectName" disabled ></el-input>
                    </el-tooltip>
                  </el-form-item>
              </el-col>
              <el-col :span="6">
                  <el-form-item label="报检日期" prop="createTime" v-if="dataForm.id!=null">
                      <el-input v-model="dataForm.createTime" disabled />
                  </el-form-item>
              </el-col>
              <el-col :span="6">
                <el-form-item label="报检人" prop="createUser" v-if="dataForm.id!=null">
                      <el-input v-model="dataForm.createUser" disabled />
                </el-form-item>
              </el-col>
            </el-row>
        </el-form>
@@ -173,9 +178,9 @@
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                          <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备！" placement="top-start">
                            <!-- <el-autocomplete clearable
                            :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                            @blur="changeState(scope.row,scope.$index)"
                            <el-autocomplete clearable
                            :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
                            @input="changeState(scope.row,scope.$index)"
                            v-model="scope.row.testValueList[index]"
                            :fetch-suggestions="querySearch"
                            placeholder="请输入或选择检测值" >
@@ -183,10 +188,10 @@
                            <template slot-scope="{ item }">
                                <div>{{ item.value }}</div>
                            </template>
                            </el-autocomplete> -->
                            </el-autocomplete>

                              <el-select style="width:100%" filterable
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                              <!-- <el-select style="width:100%" filterable
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
                              v-model="scope.row.testValueList[index]"
                              placeholder="请输入或选择检测值"
                              allow-create
@@ -196,7 +201,7 @@
                              >
                                <el-option label="是" value="是"/>
                                <el-option label="否" value="否"/>
                              </el-select>
                              </el-select> -->
                            </el-tooltip>
                          </div>
                        </template>
@@ -204,7 +209,7 @@
                      <el-table-column prop="deviceName" label="试验设备" min-width="200">
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:60%"
                            <el-select ref="" :disabled="dataForm!=null && (resultVal!=null && resultVal!='')" style="width:60%"
                            v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
                                <el-option v-for="(item,index) in deviceList"
                                :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -213,7 +218,7 @@
                            size="small"
                            slot="append"
                            icon="el-icon-full-screen"
                            :disabled="dataForm!=null && resultVal!=null"
                            :disabled="dataForm!=null && (resultVal!=null && resultVal!='')"
                            @click="codeDevice(scope.row,scope.$index)"></el-button>
                          </div>
                        </template>
@@ -221,7 +226,7 @@
                      <el-table-column prop="note" label="检验描述" width="160" >
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="检验描述"></el-input>
                            <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" v-model="scope.row.note" placeholder="检验描述"></el-input>
                          </div>
                        </template>
                      </el-table-column>
@@ -256,7 +261,7 @@
              element-loading-text="请稍等，文件上传中"
            >
              <el-upload
                :disabled="dataForm.rawInsNo==null || resultVal!=null"
                :disabled="dataForm.rawInsNo==null || (resultVal!=null && resultVal!='')"
                drag
                ref="upload"
                action="/mes/rawInsProduct/upload"
@@ -311,7 +316,7 @@
                    @click="delProcessConfigFile(scope.row)"
                    type="text"
                    size="small"
                    :disabled="resultVal!=null"
                    :disabled="(resultVal!=null && resultVal!='')"
                    >删除</el-button
                  >
                  <el-button
@@ -340,13 +345,13 @@
                <el-table-column prop="userName" label="检验员"></el-table-column>
                <el-table-column prop="judgeState" label="检验结论">
                  <template slot-scope="scope">
                    <el-tag type="success" v-if="scope.row.testState == '1'">合格</el-tag>
                    <el-tag type="danger" v-else-if="scope.row.testState == '0'">不合格</el-tag>
                    <el-tag type="success" v-if="scope.row.testState == 1">合格</el-tag>
                    <el-tag type="danger" v-else-if="scope.row.testState == 0">不合格</el-tag>
                  </template>
                </el-table-column>
                <el-table-column  label="操作">
                    <template>
                        <el-button type="text" :disabled="resultVal!=null && dataForm.id!=null" @click="showDialog()" size="small">上报</el-button>
                        <el-button type="text" :disabled="(resultVal!=null && resultVal!='') && dataForm.id!=null" @click="showDialog()" size="small">上报</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -480,7 +485,8 @@
              testState: ''
            }],
            dataRule: {
              code:[{ required: true, message: '请扫描选择零件', trigger: 'blur' }]
              code:[{ required: true, message: '请扫描选择零件', trigger: 'blur' }],
              createTime: [{ required: true, message: '请选择报检日期', trigger: 'change' }]
            },
            deviceList: [],
        }
@@ -492,12 +498,12 @@
    },
    created(){
      this.dataForm.id = this.$route.query.id
      this.resultVal = this.$route.query.resultVal
      this.resultVal = this.$route.params.resultVal
      if(this.resultVal == null){
        let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
        val == undefined ? null : this.resultVal=val
      }
      this.init()
      this.init(this.dataForm.id)
      this.getDeviceList()
    },
    watch:{
@@ -770,7 +776,7 @@
                              }
                              updateRawInsProduct(obj).then(res=>{
                                if(res.data.code === 0){
                                  this.init()
                                  this.init(this.dataForm.id)
                                }
                              })
                          }
@@ -794,9 +800,9 @@
          }
        }
      },
      init(){
        if(this.dataForm.id){
          getObj(this.dataForm.id).then(res=>{
      init(id){
        if(id){
          getObj(id).then(res=>{
            let data = res.data.data
            this.dataForm.rawInsNo = data.rawInsNo
            this.dataForm.name = data.name
@@ -883,53 +889,47 @@
        }
      },
      selectBlur(e){
        console.log(e,"-----");
        console.log(e,e.target.tabIndex);
        console.log(e.target.value);
      },
      changeState(row, index) {
          console.log(row.testValueList);
          return
        this.$nextTick(()=>{
            if(row){
                let isTrue = true
                for(var i=0;i<row.testValueList.length;i++){
                let val = row.testValueList[i]
                let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
                if(!reg.test(val) && !['是','否'].includes(val)){
                    row.testValueList[i] = null
                    this.$message.error("请输入数字或选择是否")
                    isTrue = false
                }
                }
                if(!isTrue){
                return
                }
          }
          if (row.rpId != null && row.rpId != '') {
            let val = row.testValueList.join(",")
            if (val === undefined || val === '' || val === null) {
                return
        if(row){
            let isTrue = true
            for(var i=0;i<row.testValueList.length;i++){
              let val = row.testValueList[i]
              let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
              if(val.slice(-1)!='.'){
                  if(!reg.test(val) && !['是','否'].includes(val)){
                      row.testValueList[i] = null
                      this.$message.error("请输入6位数字或选择是否")
                      isTrue = false
                  }
              }
            }
            console.log(val);
            console.log(...row.testValueList);
            let obj = {
            if(!isTrue){
              return
            }
        }
        if (row.rpId != null && row.rpId != '') {
          let val = row.testValueList.join(",")
          if (val === undefined || val === '' || val === null) {
              return
          }
          let obj = {
              deviceId: row.deviceId,
              rpId: row.rpId,
              testValue: val,
              note: row.note
            }
            console.log(obj);
            return
            updateRawInsProduct(obj).then(res => {
                if (res.data.code == 0) {
                    this.$message.success("更新成功")
                } else {
                    this.$message.error("更新失败")
                }
                this.init()
            })
          }
        })
          updateRawInsProduct(obj).then(res => {
              if (res.data.code == 0) {
                  this.$message.success("更新成功")
              } else {
                  this.$message.error("更新失败")
              }
              this.init(this.dataForm.id)
          })
        }
      },
      // 删除子项目
      delChildren(row,index,isParent) {
@@ -945,7 +945,11 @@
          let childrenIndex = this.list[i].children.findIndex(el =>{
            return el.iid == row.iid
          })
          this.list[i].children.splice(childrenIndex,1)
          if(this.list[i].children.length<2){
            this.list.splice(i,1)
          }else{
              this.list[i].children.splice(childrenIndex,1)
          }
        }
      },
      //添加子项目
@@ -967,18 +971,26 @@
        row.children.push(obj)
      },
      save(){
        let data = this.dataForm
        this.list.forEach(item=>{
          item.children.forEach(c=>{
            c.testValue=c.testValueList.join(",")
          })
        })
        data.rawInsProducts = this.list
        addRawInspects(data).then(res=>{
            this.$message.success("保存成功")
            this.$router.go(-1)
        }).catch(error=>{
          this.$message.error(error)
        this.$refs.dataForm.validate(valid=>{
            if(valid){
                const _than = this
                let data = this.dataForm
                this.list.forEach(item=>{
                item.children.forEach(c=>{
                    c.testValue=c.testValueList.join(",")
                })
                })
                data.rawInsProducts = this.list
                addRawInspects(data).then(res=>{
                    this.$message.success("保存成功")
                    // this.$router.go(-1)
                }).catch(error=>{
                this.$message.error(error)
                })
                _than.$nextTick(()=>{
                    _than.init(Number(res.data.msg))
                })
            }
        })
      },
      getDeviceList(){