完成检验下单、检验任务、报告生成变更

licp

2024-11-26 e6c3fccc9e412e79964a6dc2dae4c3da0c80095c

 src/components/view/b1-inspection-order.vue

@@ -402,18 +402,19 @@
                <div>
                  <div style="width: 100%;line-height: 30px;">
                    <el-row style="font-size: 16px;">
                      <el-col :span="16"><span>&nbsp;&nbsp;&nbsp;&nbsp;样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                      <el-col :span="8"><span>&nbsp;&nbsp;&nbsp;&nbsp;规格型号:&nbsp; </span>{{ item.model }}</el-col>
                      <el-col :span="16" style="text-align: left;"><span>&nbsp;&nbsp;&nbsp;&nbsp;样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                      <el-col :span="8" style="text-align: left;"><span>&nbsp;&nbsp;&nbsp;&nbsp;规格型号:&nbsp; </span>{{ item.model }}</el-col>
                    </el-row>
                    <el-row style="margin-top: 1px;font-size: 16px;">
                      <el-col :span="16"><span>&nbsp;&nbsp;&nbsp;&nbsp;委托单号:&nbsp; </span>{{ item.code }}</el-col>
                      <el-col :span="8"><span>&nbsp;&nbsp;&nbsp;&nbsp;电机编号:&nbsp; </span>{{ item.motorNumber }}</el-col>
                      <el-col :span="16" style="text-align: left;"><span>&nbsp;&nbsp;&nbsp;&nbsp;委托单号:&nbsp; </span>{{ item.code }}</el-col>
                      <el-col :span="8" style="text-align: left;"><span>&nbsp;&nbsp;&nbsp;&nbsp;电机编号:&nbsp; </span>{{ item.motorNumber }}</el-col>
                    </el-row>
                    <el-row style="margin-top: 1px;font-size: 16px;">
                      <el-col><span>&nbsp;&nbsp;&nbsp;&nbsp;样机完成时间:&nbsp; </span>{{ item.issueTime }}</el-col>
                      <el-col :span="16" style="text-align: left;"><span>&nbsp;&nbsp;&nbsp;&nbsp;样机完成时间:&nbsp; </span>{{ item.issueTime }}</el-col>
                      <el-col :span="8" style="text-align: left;"><span>&nbsp;&nbsp;&nbsp;&nbsp;样机员:&nbsp; </span>{{ item.issueName }}</el-col>
                    </el-row>
                    <el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
                      <el-col><span>&nbsp;&nbsp;&nbsp;&nbsp;检测项目:&nbsp; </span>{{ item.item }}</el-col>
                      <el-col style="text-align: left;"><span>&nbsp;&nbsp;&nbsp;&nbsp;检测项目:&nbsp; </span>{{ item.item }}</el-col>
                    </el-row>
                  </div>
                </div>
@@ -429,7 +430,7 @@
        </el-row>
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="overflow-y: auto;position: fixed;top:60px;right: 20px;z-index: 9999;">
    <div class="el-dialog__body" style="overflow-y: auto;position: fixed;top:60px;right: 20px;z-index: 9999;display: none;">
        <div id="printMOrder" class="printMOrder" ref="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i+'uuuuu'" style="font-size: 16px !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
            <div>
@@ -438,18 +439,19 @@
              <div>
                <div style="width: 100%;line-height: 30px;">
                  <el-row style="font-size: 16px;">
                    <el-col :span="16"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                    <el-col :span="7"><span>规格型号:&nbsp; </span>{{ item.model }}</el-col>
                    <el-col :span="16" style="text-align: left;"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                    <el-col :span="7" style="text-align: left;"><span>规格型号:&nbsp; </span>{{ item.model }}</el-col>
                  </el-row>
                  <el-row style="margin-top: 1px;font-size: 16px;">
                    <el-col :span="16"><span>委托单号:&nbsp; </span>{{ item.code }}</el-col>
                    <el-col :span="7"><span>电机编号:&nbsp; </span>{{ item.motorNumber }}</el-col>
                    <el-col :span="16" style="text-align: left;"><span>委托单号:&nbsp; </span>{{ item.code }}</el-col>
                    <el-col :span="7" style="text-align: left;"><span>电机编号:&nbsp; </span>{{ item.motorNumber }}</el-col>
                  </el-row>
                  <el-row style="margin-top: 1px;font-size: 16px;">
                    <el-col><span>样机完成时间:&nbsp; </span>{{ item.issueTime }}</el-col>
                    <el-col :span="16" style="text-align: left;"><span>样机完成时间:&nbsp; </span>{{ item.issueTime }}</el-col>
                    <el-col :span="7" style="text-align: left;"><span>样机员:&nbsp; </span>{{ item.issueName }}</el-col>
                  </el-row>
                  <el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
                    <el-col><span>检测项目:&nbsp; </span>{{ item.item }}</el-col>
                    <el-col style="text-align: left;"><span>检测项目:&nbsp; </span>{{ item.item }}</el-col>
                  </el-row>
                </div>
              </div>
@@ -487,6 +489,9 @@
               </el-row>
            </span>
      </el-dialog>
    <el-dialog title="报告下载" :visible.sync="downVisible" width="440px">
      <p v-for="(item,index) in downList" :key="index" style="text-align: left;">样品编号：{{item.codeUrl}} <el-button type="text" icon="el-icon-download" @click="handleDown(item)">报告下载</el-button></p>
    </el-dialog>
   </div>
</template>

@@ -569,7 +574,7 @@
                  type: 'text',
                  method: 'download',
                  disabFun: (row, index) => {
                     return row.state != 4 || row.reportId == null
                     return !row.reportDtos||row.reportDtos.length==0
                  }
               }, {
                  id: 'verify',
@@ -808,6 +813,8 @@
        currentRole:'',
        BZinfo:[],
        BZDialogVisible:false,
        downVisible:false,
        downList:[]
         }
      },
    watch:{
@@ -942,7 +949,7 @@
          targetStyles: ["*"], // 使用dom的所有样式，很重要
          printable: 'printMOrder',//页面
          type: "html",//文档类型
          maxWidth:360,
          maxWidth:720,
          header: '',
          style:
            `@page {
@@ -951,18 +958,18 @@
              margin-top: 0.4cm;
              margin-bottom: 0.4cm;
              padding-bottom: 0px;
              size: 400px 75px collapse;
              size: 800px 600px collapse;
            }
            html{
              zoom:100%;

            }
            @media print{
              width: 400px;
              height: 75px;
              width: 800px;
              height: 600px;
              margin:0;
            }`,
          font_size: '0.29cm',
          font_size: '16px',
        });
      },
      async print(){
@@ -998,7 +1005,10 @@
            this.$refs['ValueTable'].selectList(e)
         },
         refresh() {
        let state = this.componentData.entity.state
            this.componentData.entity = this.HaveJson(this.entityCopy)
        this.componentData.entity.state = state
        this.refreshTable()
            this.upIndex++
         },
         // 权限分配
@@ -1074,6 +1084,10 @@
         },
         // 下载报告
         download(row) {
        this.downList = row.reportDtos
        this.downVisible = true;
      },
      handleDown(row){
        let url = row.urlS?row.urlS:row.url;
        if(url){
          url = url.split('.')[0]+'.pdf'