Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 7264eb37b4332ae414ed1bb7a2bad22a5e27ddb2

 src/views/experiment/inspectionApplication/index.vue

@@ -82,7 +82,7 @@
                  label="检验类型"
                  min-width="80px">
                  <template slot-scope="scope">
                    <div v-if="scope.row.type === 0" ><span>原材料检验</span></div>
                    <div v-if="scope.row.type === 0" ><span >原材料检验</span></div>
                    <div v-if="scope.row.type === 1" ><span>委托检验</span></div>
                    <div v-if="scope.row.type === 2" ><span>成品检验</span></div>
                  </template>
@@ -180,16 +180,17 @@
              title="新增检验单"
              :visible.sync="checkTypeVisible"
              width="50%"
                     top="10vh"
            >
              <div class="check-box">
                <el-radio-group v-model="type" @change="handleRadioChange">
                  <el-radio :label="0" border >原材料检验</el-radio>
                  <el-radio :label="1" border>委托检验</el-radio>
                  <el-radio :label="2" border>成品检验</el-radio>
                <el-radio-group v-model="type" @click.native="handleRadioChange">
                  <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="0" border>原材料检验</el-radio>
                  <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="1" border>委托检验</el-radio>
                  <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="2" border>成品检验</el-radio>
                </el-radio-group>
              </div>
              <div v-if="type === 0 || type === ''">
                <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
              <div v-if="type === 0">
                <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium">
                  <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="来料日期：">
@@ -367,11 +368,86 @@
              </div>
              <span slot="footer" class="dialog-footer">
                <el-button @click="checkTypeVisible = false">取 消</el-button>
                <el-button type="primary" @click="addInspection">确 定</el-button>
                <!-- <el-button type="primary" @click="addInspection">确 定</el-button> -->
                <el-button type="primary" @click="QUEding">确 定</el-button>
              </span>
            </el-dialog>
          </div>
        </div>

        <!-- 确定跳转基本库弹窗 -->
        <el-dialog
              title="标准库"
              :visible.sync="Standardframe"
              width="48%"

              >
              <!-- <el-form :model="form">
                <el-form-item label="请选择审核结果:" :label-width="formLabelWidth">
                </el-form-item>
              </el-form> -->

              <!-- <div slot="footer" class="dialog-footer"> -->
                <el-table
                    :data="tableData"
                    style="width: 100%; margin-bottom: 20px"
                    row-key="name"
                    border
                    height="calc(100vh - 250px)"
                    default-expand-all
                    ref="multipleTable"
                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
                  >
                    <el-table-column type="selection" label="序号"> </el-table-column>
                    <el-table-column
                      type="index"
                      width="50px"
                      label="序号"
                    ></el-table-column>
                    <el-table-column label="项目名称" sortable>
                      <template scope="scope">
                        <el-tag
                          ><div
                            class="firstDiv"
                            :style="`color: ${
                              scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
                            }`"
                          >
                            {{ scope.row.code == "[1]" ? "01" : "02" }}
                          </div>
                          <span style="color: black">{{ scope.row.name }}</span></el-tag
                        >
                      </template>
                    </el-table-column>
                    <el-table-column
                      prop="unit"
                      label="单位"
                      sortable
                    ></el-table-column>
                    <el-table-column label="标准值" sortable>
                      <template scope="scope">
                        <el-input
                          v-if="scope.row.edit === true || scope.row.code === '[2]'"
                          @blur="requiredOnfocus(scope)"
                          v-model="scope.row.required"
                          placeholder="请输入标准值"
                        ></el-input>
                      </template>
                    </el-table-column>
                    <el-table-column prop="internal" label="内控值" sortable>
                      <template scope="scope">
                        <el-input
                          v-if="scope.row.edit === true || scope.row.code === '[2]'"
                          @blur="requiredOnfocus(scope)"
                          v-model="scope.row.internal"
                          placeholder="请输入内控值"
                        ></el-input>
                      </template>
                    </el-table-column>
                  </el-table>
              <!-- </div> -->
            </el-dialog>

        <!-- 原材料检验模态框 -->
        <el-dialog
        title="原材料检验"
@@ -491,7 +567,7 @@
                />
                <el-table-column
                  prop="formTime"
                  label="来料日期"
                  label="委托bian'ha"
                  min-width="10%"
                />
                <el-table-column
@@ -534,13 +610,12 @@
      </template>
      <template v-else>
        <router-view />

      </template>
    </div>
  </template>

  <script>
  import { selectInspectsList, selectAll, addInspect} from '@/api/experiment/planAssignments'
  import { selectInspectsList, selectAll, addInspect,getCommisionList} from '@/api/experiment/planAssignments'
  export default {
    data() {
      return {
@@ -588,7 +663,7 @@
          amount: '',
          checkdate: []
        },
        infoForm:'',
        infoForm:{},
        commisionSelection:{
          entrust_coding: '',
          entrusted: '',
@@ -629,10 +704,12 @@
        pageSize: 8, // 每页的数据条数
        radioValue: '全部',
        checkTypeVisible: false,
        type: '', // 默认不选中的状态
        type: 0, // 默认不选中的状态
        rawmaterialVisible: false,
        commisionVisible: false,
        tmp: ''
        tmp: '',
        Standardframe: false,
            tableData: []
      }
    },
    watch: {
@@ -653,23 +730,20 @@
    },
    methods: {
      async handleClick(row){
        // console.log(item);
        // const res = await ddd({goodId:id})
        // this.$message({
        //   message: '恭喜你，这是一条成功消息',
        //   type: 'success'
        // });

        // console.log(res);
        this.inspectionTable = row;
        console.log(row.icode);
        this.icode = row.icode
        this.$router.push({name:'Viewdetails',query: {icode:row.icode}});
        this.id = row.id
        this.$router.push({name:'Viewdetails',query: {id:row.id}});
        this.selectInspectsList()
      },
      //委托检验
      async getCommisionList() {
        const res = await getCommisionList({pageNo:1,pageSize:10 })
        this.commisionTable = res.data
        console.log(this.commisionTable);
      },
      async selectInspectsList() {
        // 获取分页列表
        const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.icode})
        const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.id})
        // this.inspectionTable = data
        // console.log(res.data.row)
        const data = res.data.row
@@ -699,7 +773,6 @@
          item['checkdate'] = checkdate // 检验日期
          item['createTime'] = createTime // 登记日期
      })
      console.log('data:',data)
      this.inspectionTable = data
      if(this.searchData.type !== ''){
        if(this.searchData.state !== ''){
@@ -742,33 +815,29 @@
      this.infoForm = this.tmp
      this.rawmaterialVisible = false
    },
    async handleRadioChange(){
      if(this.type === 0){
        // 原材料报检
        // this.rawmaterialVisible = true
        // const res = await selectAll({type: this.type})
        // var data = res.data
        // data.forEach((item)=>{
        //   var checkdate = []
        //   checkdate.push(item['createTime'])
        //   checkdate.push(item['updateTime'])
        //   item['checkdate'] = checkdate // 检验日期
        // })
        this.$router.push({ name: 'ReportForInspection' });
      }else if(this.type === 1){
        // this.commisionVisible = true
        // const res = await selectAll({type: this.type})
        // var data = res.data
        // data.forEach((item)=>{
        //   var checkdate = []
        //   checkdate.push(item['startTime'])
        //   checkdate.push(item['endTime'])
        //   item['checkdate_'] = item['startTime'] + '~' + item['endTime']
        //   item['checkdate'] = checkdate // 检验日期
        // })
        // this.commisionTable = res.data
        this.$router.push({ name: 'CommissionInspection' });
      }
    handleRadioChange(){
      setTimeout(()=>{
            if(this.type === 0){
              // 原材料报检
              this.rawmaterialVisible = true
              selectAll({type: this.type}).then(res=>{
                  var data = res.data
                  data.forEach((item)=>{
                    var checkdate = []
                    checkdate.push(item['createTime'])
                    checkdate.push(item['updateTime'])
                    item['checkdate'] = checkdate // 检验日期
                  })
                  this.rawMaterialTable = res.data
               })
              // this.$router.push({ name: 'ReportForInspection' });
            }else if(this.type === 1){
              this.commisionVisible = true
              getCommisionList({pageNo:1,pageSize:10}).then(res=>{
                  this.commisionTable = res.data
               })
            }
         },100)
    },
    // 新增检验
    async addInspection(){
@@ -811,7 +880,7 @@
          type: this.type,
          unit: this.finishedTable.unit })
      }
      this.type = ''
      this.type = 0
      this.checkTypeVisible = false
      this.$message({
          message: '添加成功！',
@@ -830,6 +899,10 @@
        console.log(`当前页: ${val}`)
        this.currentPage = val
        this.selectInspectsList()
      },
      //确定跳转
      QUEding(){
        this.Standardframe = true
      }
    }
  }
@@ -854,7 +927,7 @@
          }
          height: auto;
          font-size: 22px !important;
          padding: 20px 40px !important;
          padding: 40px 50px !important;
          ::v-deep  .el-radio__label{
            font-size: 22px !important;
            padding-left: 0px !important;