Merge remote-tracking branch 'origin/master'

Crunchy

2023-11-18 7c4b02892b24bc2d219217b5f9e352d0eb531c4e

Merge remote-tracking branch 'origin/master'

 src/api/warehouse/location.js

@@ -106,3 +106,19 @@
    params: query
  })
}

export function getIfsLocationByGroupCopy(query) {
  return request({
    url: '/mes/location/getIfsLocation/copy',
    method: 'get',
    params: query
  })
}

export function getIfsLocationByGroupCopyAll(query) {
  return request({
    url: '/mes/location/getIfsLocationByGroupCopyAll',
    method: 'get',
    params: query
  })
}

 src/views/basic/location/index.vue

@@ -198,7 +198,7 @@
          {
            minWidth: '200',
            prop: 'ifsLocation',
            label: 'ERP库位',
            label: 'IFS库位',
            sort: true,
            isTrue: false,
            isSearch: true,

 src/views/basic/location/location-form.vue

@@ -135,11 +135,10 @@
      <el-row>
        <el-col :span="12">
          <el-form-item
            v-if="permissions.basic_has_ifs"
            label="IFS库位"
            prop="ifsLocationDesc"
          >
            <!--<el-select
            <!-- <el-select
              v-model="dataForm.ifsLocation"
              filterable
              placeholder="请选择IFS库位"
@@ -152,11 +151,11 @@
                :key="index"
              >
              </el-option>
            </el-select>-->
            </el-select> -->
            <el-cascader
              v-model="dataForm.ifsLocationDesc"
              :props="locationProps"
              style="width:100%"
              style="width:100%" filterable
            ></el-cascader>
          </el-form-item>
        </el-col>
@@ -219,6 +218,7 @@
      warehouseOptions: [],
      factoryOptions: [],
      ifsLocationOptions: [],
            locationTree: [],
      visible: false,
      dataForm: {
        id: 0,
@@ -262,34 +262,39 @@
      locationProps: {
        lazy: true,
        lazyLoad(node, resolve) {
          console.log('node', node)
          const { level } = node
          if (level === 0) {
            getIfsLocationGroup().then((response) => {
              if (response.data.code === 0) {
                const _data = response.data.data

                const nodes = _data.map((item) => {
                const nodes = JSON.parse(_data)["LIST_INFO"].map((item) => {
                  return {
                    value: item.LOCATION_GROUP,
                    label: item.LOCATION_GROUP,
                    value: item.LOCATION_GROUP_DESC +'-'+ item.LOCATION_GROUP,
                    label: item.LOCATION_GROUP_DESC +'-'+ item.LOCATION_GROUP,
                    leaf: false
                  }
                })
                                var set = new Set()
                                nodes.forEach(a=>{
                                    set.add(JSON.stringify(a))
                                })
                                var list = []
                                set.forEach(a=>{
                                    list.push(JSON.parse(a))
                                })
                // 通过调用resolve将子节点数据返回，通知组件数据加载完成
                resolve(nodes)
                resolve(list)
              }
            })
          } else {
            getIfsLocationByGroup({ locationGroup: node.value }).then(
            getIfsLocationByGroup({ locationNo: node.value.split('-')[1] }).then(
              (response) => {
                if (response.data.code === 0) {
                  const _data = response.data.data

                  const nodes = _data.map((item) => {
                  const nodes = JSON.parse(_data)["LIST_INFO"].map((item) => {
                    return {
                      value: item.LOCATION_NO,
                      label: item.LOCATION_NO,
                      label: item.LOCATION_DESC +' | '+ item.LOCATION_NO,
                      leaf: true
                    }
                  })
@@ -404,7 +409,32 @@
          this.isSubmit = false
        }
      })
    }
    },
        getLocationTree(){
            getIfsLocationGroup().then((res) => {
              if (res.data.code === 0) {
                    var strs = JSON.parse(res.data.data)['LIST_INFO']
                    var set3 = new Set()
                    var set2 = new Set()
                    var set = []
                    strs.forEach(a=>{
                        set2.add(a['LOCATION_GROUP_DESC'] + '-' + a['LOCATION_GROUP'])
                    })
                    strs.forEach(a=>{
                        set2.forEach(b=>{
                            if((a['LOCATION_GROUP_DESC'] + '-' + a['LOCATION_GROUP'])==b){
                                set3.add(a['LOCATION_DESC'] + '-' + a['LOCATION_NO'])
                            }
                            set.push({
                                value: b,
                                label: b,
                                children: []
                            })
                        })
                    })
              }
            })
        }
  }
}
</script>

 src/views/basic/workstation/workstation-form.vue

@@ -138,7 +138,7 @@
          >
          </el-transfer>
        </el-tab-pane>
        <el-tab-pane label="产出不合格库位" name="disqualified">
        <!-- <el-tab-pane label="产出不合格库位" name="disqualified">
          <el-transfer
            filterable
            v-model="disqualifiedLocationIds"
@@ -159,7 +159,7 @@
            @change="handleChangeQualifiedLocation"
          >
          </el-transfer>
        </el-tab-pane>
        </el-tab-pane> -->
        <el-tab-pane label="检验待处理库位" name="pending">
          <el-transfer
            filterable

 src/views/plan/manufacturingorder/index.vue

@@ -824,12 +824,12 @@
        ],
        toolbar: [],
        operator: [
          {
            text: '查看库存',
            type: 'text',
            size: 'small',
            fun: this.searchStock
          }
          // {
          //   text: '查看库存',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.searchStock
          // }
        ],
        operatorConfig: {
          fixed: 'right',

 src/views/plan/masterproductionschedule/index.vue

@@ -771,8 +771,8 @@
      return ''
    },
    // 删除
    deleteHandle(row) {
      this.$confirm('是否确认删除ID为' + row.id, '提示', {
    deleteMainPlan(row) {
      this.$confirm('是否确认作废ID为' + row.id, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        closeOnClickModal: false,

 src/views/product/workbench/feed-pane.vue

@@ -144,14 +144,14 @@
            ><span style="font-size:14px;font-weight:bold">线边仓合格物料</span>
          </div>
          <div>
            <el-button
            <!-- <el-button
              v-if="permissions.product_feed_scan"
              class="feeding-btn"
              type="primary"
              icon="feed-btn-feeding"
              @click="scanAddFeed()"
              >扫码投料</el-button
            >
            > -->
            <el-button
              class="feeding-btn"
              type="primary"
@@ -1130,7 +1130,7 @@
        ><span style="font-size:14px;font-weight:bold">已投入未消耗物料</span>
      </div>
      <div>
                <el-button
                <!-- <el-button
                  class="return-btn"
                  type="primary"
                  @click="submitIns()"
@@ -1141,7 +1141,7 @@
                  type="primary"
                  @click="inputHandle()"
                  >尾料处理</el-button
                >
                > -->
        <el-button
          class="return-btn"
          type="primary"

 src/views/quality/finishedProductInspection/finishedProducter-print.vue

@@ -1,5 +1,5 @@
<template>
    <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 60pt;margin-left: 20pt;">
    <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 65pt;margin-left: 10pt;">
        <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:629pt'>
            <tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
                <td  colspan=3 rowspan=2 height=40 width=122 style='width:150pt;border: 1pt solid windowtext'>
@@ -77,7 +77,7 @@
                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
                    标准值
                </td>
                <td  colspan=1 v-for="a in 9" class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
                <td  colspan=1 v-for="a in columnLength" class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
                    {{a>9?item:'0'+a}}
                </td>
                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
@@ -89,9 +89,9 @@

            <tbody v-for="(item,index) in prjdata" :key="index">
            <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  rowspan=16 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
                    <p class="MsoNormal" align="center" style="text-align:center">
                        <span style="font-family:宋体">{{item.father}}</span>
                <td  :rowspan="item.children.length" height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
                    <p >
                        <span  style=" writing-mode: vertical-rl;font-size: 26pt;">{{item.father}}</span>
                    </p>
                </td>
                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
@@ -129,401 +129,6 @@
                </td>
            </tr>
            </tbody>


            <!-- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=9 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr> -->

            <!-- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>通断/线序</td>
                <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>1600VCD, lmin:  &nbsp;&nbsp;□合格 &nbsp;&nbsp; □不合格</td>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
border-left:none'>2200VCD, lmin:  &nbsp;&nbsp;□合格 &nbsp;&nbsp; □不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>4500VCD, lmin:  &nbsp;&nbsp;□合格 &nbsp;&nbsp; □不合格</td>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
border-left:none'>00VCD, min:  &nbsp;&nbsp;□合格 &nbsp;&nbsp; □不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td colspan=2 rowspan=4 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>通信</p><p>( 1 或 2)</p></td>
            <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>1</td>
            <td  colspan=9 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>符合TIA Cat 5e Channel标准：    □合格    □不合格</td>
            <td  colspan=3 rowspan="4" class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>□合格</p><p>□不合格</p></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>2</td>
            <td  colspan=9 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>千兆网通信测试速率≥800Mbps/百兆网通信测试速率≥80Mbps</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>插入损耗≤</p> <p> _________dB</p><p>□1310,□1550</p></td>
            <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            <td  colspan=3 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>□合格</p><p>□不合格</p></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>回波损耗≤</p> <p> _________dB</p><p>□1310,□1550</p></td>
            <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            <td  colspan=3 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>□合格</p><p>□不合格</p></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
  <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>气密性</td>
            <td  colspan=14 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>插座（0.3MPa@60s）：  &nbsp;&nbsp;  □合格  &nbsp; &nbsp; □不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>水密性</td>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>15MPa保压10min, 2次  &nbsp;  □合格  &nbsp;  □不合格</td>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'> 36MPa保压2h, 2次  &nbsp;  □合格  &nbsp;  □不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>36MPa保压10min, 2次  &nbsp;  □合格  &nbsp;  □不合格</td>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'> 75MPa保压2h, 2次  &nbsp;  □合格  &nbsp;  □不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>MPa保压 min, 2次  &nbsp;  □合格  &nbsp;  □不合格</td>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'> MPa保压 h, 2次  &nbsp;  □合格  &nbsp;  □不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>水压后通断</td>
            <td  colspan=14 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp;&nbsp;  □合格  &nbsp; &nbsp;&nbsp;□不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>水压后绝缘电阻</p><p>(要求同上)</p></td>
            <td  colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>测试值</p><p>结果最小值</p></td>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
                <td  colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>□合格</p><p>□不合格</p></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td  colspan=9 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>外观检查</td>
            <td  colspan=14 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp;&nbsp;  □合格  &nbsp; &nbsp;&nbsp;□不合格</td>
            </tr>

            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>电缆长度(m)</p><p>或导线长度(cm)</p></td>
            <td  colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>测试结果</p><p>偏差最大值</p></td>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
                <td  colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>□合格</p><p>□不合格</p></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td  colspan=9 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>插针高低落差</p><p>≤0.6mm</p></td>
            <td  colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>测试结果</p><p>偏差最大值</p></td>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品_</td>
                <td  colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>□合格</p><p>□不合格</p></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td  colspan=9 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>电缆弯曲半径</td>
            <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'> 要求</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'> 实测</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr>
              <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=16  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>发货</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>产品型号核对</td>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>与装箱清单型号一致:</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>产品数量清点</td>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>与装箱清单数量一致:</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr>
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>产品唛头检查</td>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>与装箱清单内容一致,粘贴与显眼位置,没有损坏:</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr>

            <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=6 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>产品包装检查</td>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>同一型号产品单独包装:</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr>

            <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>连帽颜色与文件要求一致</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr>
           <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>纸箱使用透明胶带或拉伸膜裹紧</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr><tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>木箱内部必须垫好泡沫纸,钉紧木箱,钢带扎紧</td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr><tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>使用珍珠棉板固定插头、插座位置，固定插座尾线位置</p>  <p>用拉神膜将产品固定在珍珠面板内</p></td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr>
            <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>发出产品不得出现任何形式的供应商信息，包括缆盘上的标签、电缆</p><p>上供应商名称等</p></td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td> -->
            <!-- </tr> -->
            <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td colspan=8  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt;text-align: left;'><p>&nbsp;检验/时间:</p></td>
@@ -541,10 +146,11 @@
                <td width=235 style='width:176pt'></td>
            </tr>
        </table>

    <!-- <div v-for="items in prjdata">
        <div v-for="aa in items.length"> -->
        <template>
            <div style="margin-top: 100pt;width: 75%;">
                <div class="head">
                <div class="head" id="head">
                    <div class="head-1">
                        <img width=174 height=58 src="../../../../public/img/image002.png">
                    </div>
@@ -618,7 +224,260 @@
                </div>      
            </div>
        </template>
    </div>

        <template>
            <div style="margin-top: 100pt;width: 75%;">
                <div class="head">
                    <div class="head-1">
                        <img width=174 height=58 src="../../../../public/img/image002.png">
                    </div>
                    <div class="head-2">
                        <p><span style="font-size:18pt;font-family:宋体;margin-right: 70pt;">中天海洋系统有限公司</span></p>
                        <span style="font-size:12pt;font-family:宋体;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
                    </div>
                </div>
                <div class="bodycss">
                    <div class="bodycs">
                        <p class=x1111111><span>检 测 报 告<br>
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                        </span></p>
                        <div  class="bodycs-1">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:黑体">页次：2/8<br> Page</span></p>
                        </div>
                    </div>
                    <div>   
                        <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
                        <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:黑体">样品照片:<br>Sample：</span></p>
                    </div>
                    <div>
                        <table border="2px" style="width: 500px;height: 500px;margin-top: 100px;">
                            <tr style="height: 50px;">
                                <td class="x1111113"><span style="font-size 40pt;margin-left: 200px;font-family:黑体">测试前照片</span></td>
                            </tr><tr></tr>
                        </table>
                    </div>
                    <div style="display: flex;margin-top: 130px;margin-left: 40px;">
                        <p  ><span style="font-size:12pt;font-family:黑体">样品信息描述Sample information description：<br>测试前样品状态：Sample state of pretest&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>外观检查：样品外观均正常。&nbsp;&nbsp;&nbsp;&nbsp;</span></p>

                    </div>
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>            
            </div>
        </template>

        <template>
            <div style="margin-top: 100pt;width: 75%;">
                <div class="head">
                    <div class="head-1">
                        <img width=174 height=58 src="../../../../public/img/image002.png">
                    </div>
                    <div class="head-2">
                        <p><span style="font-size:18pt;font-family:宋体;margin-right: 70pt;">中天海洋系统有限公司</span></p>
                        <span style="font-size:12pt;font-family:宋体;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
                    </div>
                </div>
                <div class="bodycss">
                    <div class="bodycs">
                        <p class=x1111111><span>检 测 报 告<br>
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                        </span></p>
                        <div  class="bodycs-1">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:黑体">页次：3/8<br> Page</span></p>
                        </div>
                    </div>
                    <div>   
                        <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
                        <p class="x1111113" ><span style="display: flex;margin-top: 40px;margin-left: 40px;">报告正文：</span></p>
                    </div>
                    <div class="bodycs" style="margin-top: 30px;">
                        <p class=x1111112><span>{{iname}}<br>
                        </span></p>
                        <div  class="bodycs-1" style="margin-top: 10px;">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">1.测试设备<br>&nbsp;设备名称<br>Name of Equipment</span></p>
                            <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>设备型号<br>&nbsp;Model</span></p>
                            <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>设备编号<br>Serial No.</span></p>
                            <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>校准有效期<br>Calibration Due Date</span></p>
                        </div>
                        <div>   
                        <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
                        </div>
                    </div>
                    <div style="margin-top: 50px;display: flex;">
                        <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">2.参考标准Reference standards&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>本次检测所依据的技术文件（代号、名称）：<br>Reference documents for this testing&nbsp;&nbsp;&nbsp;&nbsp;</span></p>
                    </div>
                    <div>   
                            <p style=" border-top: 1px solid black;width: 96%;margin-top: 1px;"></p>
                    </div>
                    <div style="margin-top: 50px;display: flex;">
                        <p  class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">3.环境条件Environmental conditions：</span></p>
                    </div>
                    <div style="display: flex;">
                        <p style="margin-left: 50px;"><span >温度(Temperature)：℃ </span></p>
                        <p style="margin-left: 450px;"><span >相对湿度(R.H.)：%</span></p>
                    </div>
                    <div style="margin-top: 50px;display: flex;">
                        <p  class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">4.测试目的Test purpose：</span></p>
                    </div>
                    <div style="margin-top: 50px;display: flex;">
                        <p  class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">5.测试方法Test method：</span></p>
                    </div>
                    <div>
                        <br>
                    <br>
                    <br>
                    <span
                        style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                    </div>
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>            
            </div>
        </template>

        <template>
            <div style="margin-top: 100pt;width: 75%;">
                <div class="head">
                    <div class="head-1">
                        <img width=174 height=58 src="../../../../public/img/image002.png">
                    </div>
                    <div class="head-2">
                        <p><span style="font-size:18pt;font-family:宋体;margin-right: 70pt;">中天海洋系统有限公司</span></p>
                        <span style="font-size:12pt;font-family:宋体;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
                    </div>
                </div>
                <div class="bodycss">
                    <div class="bodycs">
                        <p class=x1111111><span>检 测 报 告<br>
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                        </span></p>
                        <div  class="bodycs-1">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:黑体">页次：4/8<br> Page</span></p>
                        </div>
                    </div>
                    <div>   
                        <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
                        <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:黑体">6.测试结果Test result：</span></p>
                    </div>
                    <div>
                        <table border="2px" style="width: 800px;height: 100px;margin-top: 10px;">
                            <tr style="height: 80px;">
                                <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:黑体">测试项目</span></td>
                                <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:黑体">样品数量</span></td>
                                <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:黑体">测试结果</span></td>
                            </tr>
                            <tr style="height: 100px;">
                                <td></td>
                                <td></td>
                                <td></td>
                            </tr>
                            <tr style="height: 80px;">
                                <td colspan=3></td>
                            </tr>
                        </table>
                    </div>
                    <div>   
                        <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:黑体">7.测试资料Test data：</span></p>
                    </div>
                    <div>
                        <table border="2px" style="width: 500px;height: 400px;margin-top: 10px;">
                            <tr style="height: 50px;">
                                <td class="x1111113"><span style="font-size 40pt;margin-left: 200px;font-family:黑体">测试前照片</span></td>
                            </tr><tr></tr>
                        </table>
                    </div>
                    <div>
                        <br>
                    <br>
                    <br>
                    <span
                        style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                    </div>
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>            
            </div>
        </template>

        <template>
            <div style="margin-top: 100pt;width: 75%;">
                <div class="head">
                    <div class="head-1">
                        <img width=174 height=58 src="../../../../public/img/image002.png">
                    </div>
                    <div class="head-2">
                        <p><span style="font-size:18pt;font-family:宋体;margin-right: 70pt;">中天海洋系统有限公司</span></p>
                        <span style="font-size:12pt;font-family:宋体;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
                    </div>
                </div>
                <div class="bodycss">
                    <div class="bodycs">
                        <p class=x1111111><span>检 测 报 告<br>
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                        </span></p>
                        <div  class="bodycs-1">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:黑体">页次：5/8<br> Page</span></p>
                        </div>
                    </div>
                    <div>
                        <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
                        <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:黑体">8.测试曲线Test curve：</span></p>
                    </div>
                    <div>
                        <br>
                        <br>
                        <br>
                        <br>
                        <br>
                        <br>
                        <br>
                        <span>&nbsp;</span>
                    </div>
                    <div>   
                        <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:黑体">9.测试后检查Posttest check：</span></p>
                    </div>
                    <div>
                        <table border="2px" style="width: 900px;height: 500px;margin-top: 30px;">
                            <tr style="height: 50px;">
                                <td colspan=2 class="x1111113"><span style="font-size 40pt;margin-left: 380px;font-family:黑体">测试后照片</span></td>
                            </tr>
                            <tr>
                                <td></td>
                                <td></td>
                            </tr>
                        </table>
                    </div>
                    <div>
                        <p class="x1111113"><span >*****报告结束*****</span></p>
                    </div>
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>            
            </div>
        </template>
        <!-- </div>
    </div>  -->
</div>
</template>

<script>
@@ -647,6 +506,8 @@
            materialCode:null,
            quantity:null,
            username:null,
            iname:null,
            columnLength: 9,
        }
    },
    filters:{
@@ -665,14 +526,14 @@
    },
    created(){
        this.tableData = this.formData
        console.log(this.tableData,"=======================77777777");
        this.initData()
        this.initprjdata(this.prjdata)
    },
    methods:{
        initData(){
            let ii = []
        console.log("<------------------------------->");
            let pp = []
        console.log("<-------------------->");
            this.deviceStr = this.tableData.projectName
            this.product = this.tableData.material
            this.number = this.tableData.quantity
@@ -680,16 +541,20 @@
            this.material = this.tableData.material
            this.materialCode = this.tableData.materialCode
            this.quantity = this.tableData.quantity
            console.log(this.tableData,"--------------------11111");
            console.log(this.tableData,"-----------11111");
            this.tableData.children.forEach(el =>{
                this.prjdata.push(el)
                el.children.forEach(kl =>{
                    if(kl.userName){
                        ii.push(kl.userName)
                    }
                    if(kl.iname){
                        pp.push(kl.iname)
                    }
                })
            })
                this.username = Array.from(new Set(ii)).join(",")
                this.iname = Array.from(new Set(pp)).join(",")
        },
        initprjdata(list){
            console.log(list,"uuuuuuuuuuuuuuuuu");
@@ -703,28 +568,30 @@
                            required: '',
                            iunit: '',
                            itype: '',
                            testValueList: new Array(9)
                            testValueList: new Array(this.columnLength)
                        }
                        let rowNum = 15
                        let columnNum = this.columnLength
            if(list && list.length<2){
                list.forEach(item=>{
                    if(item.children && item.children.length < 7){
                        let size = 15 - item.children.length
                    if(item.children && item.children.length < rowNum){
                        rowNum = 15 - item.children.length
                        for(let j=0;j<item.children.length;j++){
                            let arr = []
                            if(item.children[j].inspectionValue){
                                arr = item.children[j].inspectionValue.split(",")
                            }
                            item.children[j].testValueList = arr
                            if(item.children[0].testValueList.length<12){
                                let num = 9 - item.children[j].testValueList.length
                            if(item.children[j].testValueList.length<columnNum){
                                let num = columnNum - item.children[j].testValueList.length
                                for(let i=0;i<num;i++){
                                    item.children[j].testValueList.push("")
                                }
                            }
                        }
                        for(let i=0;i< size;i++){
                        for(let i=0;i< rowNum;i++){
                            item.children.push(data)
                            item.father
                            // item.father
                        }
                    }
                })
@@ -733,15 +600,30 @@
                list.forEach(item=>{
                    if(item.children){
                        size+=item.children.length
                        item.children.forEach(obj=>{
                            if(obj.inspectionValue){
                                let testValueList = obj.inspectionValue.split(",")
                                obj.testValueList = testValueList
                                if(testValueList.length < columnNum){
                                    let len = columnNum-testValueList.length
                                    for(var i=0;i<len;i++){
                                        obj.testValueList.push("")
                                    }
                                }
                            }else{
                                obj.testValueList = new Array(12)
                            }
                        })
                    }
                })
                if(size<15){
                    let num = 15 - size
                if(size < rowNum){
                    let num = rowNum - size
                    for(let i=0;i<num;i++){
                        list[list.length-1].children.push(data)
                    }
                }
            }
            this.prjdata = list
        }
    },
    watch:{

 src/views/quality/finishedProductInspection/index.vue

@@ -205,7 +205,7 @@
        watch:{
        printFormData(newVal){
            if(newVal){
                console.log("pData变化--",newVal);
                // console.log("pData变化--",newVal);
                this.printFormData = newVal
            }
        }
@@ -217,11 +217,19 @@
            },
            //打印按钮
            printFun() {
            this.printDialogVisible = false;
                const printSettings = {
                        paper: {
                        width: 827, // A4纸的宽度（单位：像素）
                        height: 595, // A4纸的高度（单位：像素）
                        orientation: 'portrait', // 竖向打印
                        }}
                        
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    header:"",
                    maxWidth: 950,
                    printSettings,
                    style: '@page {margin: 2.0mm 2.0mm}',
                    targetStyles: ["*"],
                    // importCSS: true,
@@ -236,22 +244,20 @@
                    this.printFormData = res.data.data
                    this.printFormData.createTime = row.createTime
                    this.printFormData.updateTime = row.updateTime
                    console.log(this.printFormData,"7777777777=====");
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);
                })
            },
            exportExcel(){
                let queryParam=this.$refs.finishedProduct.getQueryParam();
                delete queryParam.criteria
                console.log(queryParam);
                // console.log(queryParam);
                exportExaminationProducts(queryParam).then((res)=>{
                    transform(res)
                })
            },
            deleteHandle(row){
                console.log(row.id)
                // console.log(row.id)
                this.$confirm('确认删除该数据吗？', '提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',

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

@@ -367,7 +367,9 @@
                    this.projectList.push(e)
                    if(e.children){
                        e.children.forEach(o =>{
                            deviceNameList.push(o.deviceName)
                            if(o.deviceName){
                                deviceNameList.push(o.deviceName)
                            }
                        })
                    }
                });
@@ -424,6 +426,8 @@
                                        obj.testValueList.push("")
                                    }
                                }
                            }else{
                                obj.testValueList = new Array(12)
                            }
                        })
                    }

 src/views/technology/operation/operation-form.vue

@@ -592,8 +592,8 @@
      // }
    },
    init() {
      this.operationId = this.dataForm.id
      this.fetchCapabilityForOperation()
      // this.operationId = this.dataForm.id
      // this.fetchCapabilityForOperation()
      if (this.dataForm.id) {
        getObj(this.dataForm.id).then((response) => {
          this.dataForm = response.data.data