value
2024-06-03 2e9370979f871bf47f6dc145c49d7bf32ffa4b51
完成光纤配置进行检验
已修改2个文件
151 ■■■■ 文件已修改
src/components/do/b1-ins-order/add.vue 139 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/fiberoptic-config.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/add.vue
@@ -222,27 +222,31 @@
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>工程名称:</div>
          <div class="search_label">工程名称:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineering" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineering"
              :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>工程名称EN:</div>
          <div class="search_label">工程名称EN:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineeringEn" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineeringEn"
              :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>生产单位:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.production" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.production"
              :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>生产单位EN:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.productionEn" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.productionEn"
              :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
@@ -374,7 +378,8 @@
        <el-table-column prop="ask" label="要求值" min-width="220px">
          <template slot-scope="scope">
            <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable type="textarea"
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)" v-if="active==1&&isAskOnlyRead"></el-input>
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
              v-if="active==1&&isAskOnlyRead"></el-input>
              <span v-else>{{ scope.row.ask }}</span>
          </template>
        </el-table-column>
@@ -415,71 +420,6 @@
      <span slot="footer" class="dialog-footer">
        <el-button @click="selectStandardTree = false">取 消</el-button>
        <el-button type="primary" @click="activeStandardTree">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="添加样品" :visible.sync="addSampleDia" width="400px">
      <div class="body" style="max-height: 60vh;">
        <el-row>
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>样品名称:</div>
            <div class="search_input">
              <el-input readonly size="small" v-model="sample.sample">
                <template slot="append"><el-button slot="append" icon="el-icon-search"
                    @click="selectStandardTree = true"></el-button></template>
              </el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>工厂名称:</div>
            <div class="search_input">
              <el-input size="small" clearable disabled v-model="sample.factory"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>实验室名称:</div>
            <div class="search_input">
              <el-input size="small" clearable disabled v-model="sample.laboratory"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>样品类型:</div>
            <div class="search_input">
              <el-input size="small" clearable disabled v-model="sample.sampleType"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>规格型号:</div>
            <div class="search_input">
              <el-input size="small" placeholder="请输入" clearable v-model="sample.model"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label">样品编号:</div>
            <div class="search_input">
              <el-input v-model="sample.sampleCode" size="small" placeholder="请输入" clearable></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="24">
            <div class="search_label">样品数量:</div>
            <div class="search_input">
              <el-input-number size="small" v-model="sample.sampleNum" :min="1" :max="100" :precision="0"
                style="width: 50%;"></el-input-number>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label">样品留样:</div>
            <div class="search_input">
              <el-radio-group v-model="sample.isLeave">
                <el-radio :label="1">留样</el-radio>
                <el-radio :label="0">不留样</el-radio>
              </el-radio-group>
            </div>
          </el-col>
        </el-row>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="addSampleDia = false">取 消</el-button>
        <el-button type="primary" @click="onSample()" :loading="getProductLoad">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="保存模板" :visible.sync="templateDia" width="400px">
@@ -759,10 +699,6 @@
          this.$message.error('请输入来样方式')
        } else if (!this.addObj.orderType) {
          this.$message.error('请选择检验类别')
        }else if (!this.addObj.engineering) {
          this.$message.error('请输入工程名称')
        } else if (!this.addObj.engineeringEn) {
          this.$message.error('请输入工程名称EN')
        }else if (!this.addObj.production) {
          this.$message.error('请输入生产单位')
        }else if (!this.addObj.productionEn) {
@@ -780,7 +716,8 @@
          this.$axios.post(this.$api.insOrder.addInsOrder, {
            insOrder: this.addObj,
            list: JSON.stringify(this.sampleList.map(a=>{
              a.model = a.model + ((a.modelNum==null||a.modelNum==''||a.modelNum=='null')?'':('-'+a.modelNum))
              a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : (
                '-' + a.modelNum))
              return a
            }))
          }, {
@@ -989,54 +926,6 @@
        val.forEach(a => {
          this.sampleIds.push(a.id)
        })
      },
      onSample() {
        if (this.sample.sample == null || this.sample.sample == '') {
          this.$message.error('请选择样品')
          return
        }
        if (this.sample.model == null || this.sample.model == '') {
          this.$message.error('请输入样品型号')
          return
        }
        // this.getProductLoad = true
        /* this.$axios.post(this.$api.standardTree.selectStandardProductList, {
            factory: this.sample.factory,
            laboratory: this.sample.laboratory,
            sampleType: this.sample.sampleType,
            sample: this.sample.sample,
            model: this.sample.model
        }, {
            headers: {
                'Content-Type': 'application/json'
            }
        }).then(res => {
            res.data.forEach(a => {
                a.state = 1
            })
            for (var i = 0; i < this.sample.sampleNum; i++) {
                this.sample.joinName = null
                this.sample.joinModel = null
                this.sample.joinNum = 1
                this.sample.insProduct = res.data
                this.sample.id = this.count
                this.sampleList.push(this.HaveJson(this.sample))
                this.count++
            }
            this.$refs.sampleTable.doLayout()
            this.getProductLoad = false
            this.addSampleDia = false
            this.sample = {
                sampleCode: null,
                laboratory: null,
                factory: null,
                sampleType: null,
                sample: null,
                model: null,
                sampleNum: 1,
                isLeave: 0,
            }
        }) */
      },
      delSample() {
        this.sampleIds.forEach(a => {
src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -546,21 +546,29 @@
        })
      },
      rowClickFiber(row, column, event,type){
        if(this.active===1){
        if(type==0){
          let standard = this.miresStandards.find(a => a.id == this.miresStandard)
            let standard = null;
            try{
              standard = this.miresStandards.find(a => a.id == this.miresStandards)
            }catch(e){}
          if(standard&&standard.code=='委托要求'){
            this.isAskOnlyRead = false;
          }else{
            this.isAskOnlyRead = true;
          }
        }else{
          let standard = this.mireStandards.find(a => a.id == this.mireStandard)
            let standard = null;
            try{
              standard = this.mireStandards.find(a => a.id == this.mireStandard)
            }catch(e){}
          if(standard&&standard.code=='委托要求'){
            this.isAskOnlyRead = false;
          }else{
            this.isAskOnlyRead = true;
          }
        }
        }
        this.currentDetectionItems = row
        this.detectionItems = row.productList
        if(this.detectionItems === null) return