Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-11-20 d08dfe986afb4c310a7a17b23985d92b4afb6fd5

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/api/product/handymantype.js

@@ -119,3 +119,18 @@
    params: query
  })
}

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

export function qualifiedLocation(id) {
  return request({
    url: '/mes/product/qualifiedLocation/' + id,
    method: 'get'
  })
}

 src/api/product/personboard.js

@@ -134,6 +134,14 @@
  })
}

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

export function changeOperationTaskState(ids, event) {
  return request({
    url: '/mes/operationTask/product/changeState/' + event,
@@ -260,14 +268,6 @@
  })
}

export function submitProductMain(obj) {
  return request({
    url: '/mes/product/submitProductMain',
    method: 'post',
    data: obj
  })
}

export function batchSaveProductOutput(obj) {
  return request({
    url: '/mes/product/batchSaveProductOutput',
@@ -339,6 +339,15 @@
    url: '/mes/product/state/batchChange/' + event,
    method: 'post',
    data: ids
  })
}

// 批量提交
export function batchChangeCopy(qury, event) {
  return request({
    url: '/mes/product/state/batchChangeCopy/' + event,
    method: 'post',
    data: qury
  })
}

@@ -518,9 +527,41 @@
  })
}

export function getOperationTaskCopy(query) {
export function submitInsPart(obj) {
  return request({
    url: '/mes/operationTask/getOperationTaskCopy',
    url: '/mes/applyPart/submitIns',
    method: 'post',
    data: obj
  })
}

export function submitProductMain(obj) {
  return request({
    url: '/mes/product/submitProductMain',
    method: 'post',
    data: obj
  })
}

export function inputHandle(obj) {
  return request({
    url: '/mes/feeding/inputHandle',
    method: 'post',
    data: obj
  })
}

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

export function generateBackflush(query) {
  return request({
    url: '/mes/product/generateBackFlush',
    method: 'get',
    params: query
  })

 src/views/product/workbench/workReportCard.vue

@@ -126,7 +126,7 @@
          <!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out"
          :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >交班
        </el-button> -->
          <el-button class="submit-out-btn" type="primary"
        <el-button class="submit-out-btn" type="primary"
            :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()"
            :loading="submitLoading">提交
          </el-button>
@@ -3246,7 +3246,7 @@
        // 刷新产出记录
        // this.$emit('refreshProductOutput')
      } else if (refreshType === 5) {
        // 提交报告后，刷新
        // 提交报告后，刷
        // 刷新工单列表
        this.$emit('refreshOperateTasks')
        // 刷新产出记录
@@ -3270,7 +3270,9 @@
            this.options = res.data.data
            if (this.options.length > 1) {
              this.dialogVisible = true
            } else {
            } else if(this.options.length == 0){
                            this.$message.error('工作站未绑定合格库位')
                        } else {
              this.locationIdValue = this.options[0].id
              this.submitListApi()
            }

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

@@ -1,18 +1,18 @@
<template class="WordSection1">
<div   align=center  style="word-wrap:break-word;text-justify-trim:punctuation">
<template>
<div  class="WordSection1"  align=center  style="word-wrap:break-word;text-justify-trim:punctuation">
        <div align="center" >
            <table style='border-collapse:collapse;table-layout:fixed;width:629pt;page-break-after: always;margin-left: 25pt;margin-top: 80px;'>
                <tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
            <table  style="border-collapse:collapse;table-layout:fixed;page-break-after: always;" width="629">
                <tr class="xl6524921" height=20 style='mso-height-source:userset;height:30.0pt'>
                    <td  colspan=3 rowspan=2  style='width:160pt;height: 60pt;border: 1pt solid windowtext'>
                        <span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
                            <img width=174 height=58 src="../../../../public/img/image001.jpg">
                        </span>
                    </td>
                    <td colspan=6 class=xl6624921  style='border-right:.5pt solid black;border-left:none;width:260pt;height: 60pt'>记录名称:连接器及成品检验记录表</td>
                    <td colspan=3 class=xl6624921   style='border-left:none;width: 160pt;height: 60pt'>保存期限:25年</td>
                    <td rowspan=2 colspan=3 class=xl6824921 width=235 style='width:136pt;height: 60pt' >版本号: A/0</td>
                    <td colspan=6 class="xl6624921"  style='border-right:.5pt solid black;border-left:none;width:380pt;height: 60pt'>记录名称:连接器及成品检验记录表</td>
                    <td colspan=3 class="xl6624921"   style='border-left:none;width: 160pt;height: 60pt'>保存期限:25年</td>
                    <td rowspan=2 colspan=3 class="xl6824921"  style='width:136pt;height: 60pt' >版本号: A/0</td>
                </tr>
                <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
                <tr class="xl6524921" height=33 style='mso-height-source:userset;height:25.05pt'>
                    <td colspan=6 height=33 class=xl6624921 style='border-right:.5pt solid black;height:25.05pt;border-left:none'>
                        记录编号:ZTT/QR-8.6-05（A/0)
                    </td>
@@ -21,48 +21,48 @@
                    </td>
                    <td colspan=2  class=xl6824921 style='border-top:none'></td>
                </tr>
                <tr class=xl6524921  style='mso-height-source:userset;height:25.05pt'>
                <tr class="xl6524921"  style='mso-height-source:userset;height:25.05pt'>
                    <td colspan=16  class=xl7424921 width=1194 style='height:25.05pt;  width:897pt'>
                        连接器及成品检验记录表
                    </td>
                </tr>
                <tr class=xl6524921  style='mso-height-source:userset;height:40.05pt'>
                    <td colspan=2 class=xl7624921 style='border-right:.5pt solid black;  height:40.05pt'>
                <tr class="xl6524921" style='mso-height-source:userset;height:40.05pt'>
                    <td colspan=2 class="xl7624921" style='border-right:.5pt solid black;  height:40.05pt'>
                        项目名称:
                    </td>
                    <td colspan=5 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>　
                    <td colspan=5 class="xl6624921" style='border-right:.5pt solid black;  border-left:none'>　
                        <p class="MsoNormal" align="center" style="text-align:center">
                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="deviceStr"></span>
                        </p>
                </td>
                    <td   colspan=2  class=xl6924921 style='border-top:none;border-left:none'>检验依据:</td>
                    <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
                    <td   colspan=2  class="xl6924921" style='border-top:none;border-left:none'>检验依据:</td>
                    <td colspan=7 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'>
                <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=4 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
                    <td  colspan=4 class="xl6624921" style='border-right:.5pt solid black;  border-left:none'>
                        <p class="MsoNormal" align="center" style="text-align:center">
                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="product"></span>
                        </p>
                    </td>
                    <td  colspan=2 class=xl6924921 style='border-top:none;border-left:none'>产品型号:</td>
                    <td colspan=3  class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
                    <td  colspan=2 class="xl6924921" style='border-top:none;border-left:none'>产品型号:</td>
                    <td colspan=3  class="xl6624921" style='border-right:.5pt solid black;  border-left:none'>
                    <p class="MsoNormal" align="center" style="text-align:center">
                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="typedata"></span>
                    </p>
                </td>
                    <td  colspan=2 class=xl6924921 style='border-top:none;border-left:none'>产品数量:</td>
                    <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
                    <td  colspan=2 class="xl6924921" style='border-top:none;border-left:none'>产品数量:</td>
                    <td  colspan=3 class="xl6624921" style='border-right:.5pt solid black;  border-left:none'>
                    <p class="MsoNormal" align="center" style="text-align:center">
                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="number"></span>
                    </p>
                </td>
                </tr>

                <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <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>
@@ -71,7 +71,7 @@
                    </td>
                </tr>

                <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <tr class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
                    <td colspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;height:40.05pt'>
                        检验要求
                    </td>
@@ -89,7 +89,7 @@


                <tbody v-for="(item,index) in prjdata" :key="index">
                <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <tr  class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
                    <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>
@@ -112,7 +112,7 @@
                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">不合格</span></p>
                    </td>
                </tr>
                <tr class=xl6524921 height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
                <tr class="xl6524921" height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
                    <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
                        <span style="font-family:宋体">{{el.iname}}</span>
                    </td>
@@ -130,7 +130,7 @@
                    </td>
                </tr>
                </tbody>
                <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <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;检验/时间:<span>{{tableData.createTime}}</span></p></td>
                <td colspan=8  height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt;text-align: left;'>
@@ -151,9 +151,9 @@
        </div>
        <div v-for="pel in prjdata">
        <template>
            <div style="page-break-after: always;">
            <div  align="center" style="page-break-after: always;border-collapse:collapse;table-layout:fixed;page-break-after: always;" width="629">
            <div >
                <div class="head" id="head">
                <div class="head">
                    <div class="head-1">
                        <img width=174 height=58 src="../../../../public/img/image002.png">
                    </div>
@@ -166,13 +166,14 @@
                    <div class="bodycs">
                        <p class=x1111111><span>检 测 报 告<br>
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                            <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
                            <p style=" border-top: 1px solid black;width: 900pt;margin-top: -1px;"></p>
                        </span></p>
                    </div>
                    <div class="bodycs-1">
                        <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <div style="margin-left:40pt">
                                <div class="bodycs-1">
                        <p  ><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                        <p style="margin-left: 350px;"><span style="font-size:12pt;font-family:黑体">报告日期<br> Report Date</span></p>
                        <p style="margin-left: 180px;"><span style="font-size:12pt;font-family:黑体">页次：1/8<br> Page</span></p>
                        <p style="margin-left: 190px;"><span style="font-size:12pt;font-family:黑体">页次：1/8<br> Page</span></p>
                    </div>
                    <div>
                    <div class="bodycs-2">
@@ -208,6 +209,14 @@
                        <p ><span class="x1111113">检验员：<br>&nbsp;Tested by</span></p> 
                        <p ><span  class="time">{{username}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        </div>
                        <div>
                        <br>
                        <br>
                        <br>
                        <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 class="cldata">
                        <p ><span class="x1111113">送样日期:<br>Delivery Date</span></p> 
                        <p ><span class="time">{{tableData.updateTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
@@ -216,11 +225,12 @@
                        <p ><span class="x1111113">测试日期:<br>Testing Date</span></p> 
                        <p ><span class="time">{{tableData.createTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        </div>
                            </div>
                    </div>
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;margin-left: 40pt;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>      
@@ -268,6 +278,14 @@
                    </div>
                </div>
                </div>
                <div>
                        <br>
                        <br>
                        <br>
                        <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 class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
@@ -303,7 +321,7 @@
                        <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;">
                    <div class="bodycs" style="margin-top: 80px;">
                        <p class=x1111112><span>{{iname}}<br>
                        </span></p>
                        <div  class="bodycs-1" style="margin-top: 10px;">
@@ -316,13 +334,13 @@
                        <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
                        </div>
                    </div>
                    <div style="margin-top: 50px;display: flex;">
                    <div style="margin-top: 100px;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;">
                    <div style="margin-top: 80px;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;">
@@ -332,7 +350,7 @@
                    <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;">
                    <div style="margin-top: 80px;display: flex;">
                        <p  class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">5.测试方法Test method：</span></p>
                    </div>
                    <div>
@@ -413,6 +431,13 @@
                    <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>
                        <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">
@@ -460,6 +485,13 @@
                        <br>
                        <span>&nbsp;</span>
                    </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>   
                        <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:黑体">9.测试后检查Posttest check：</span></p>
                    </div>
@@ -479,6 +511,13 @@
                    </div>
                </div>
                </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 class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
@@ -581,7 +620,7 @@
                            itype: '',
                            testValueList: new Array(this.columnLength)
                        }
                        let rowNum = 15
                        let rowNum = 20
                        let columnNum = this.columnLength
            if(list && list.length<2){
                list.forEach(item=>{
@@ -1760,6 +1799,7 @@

.head{
    display: flex;
    width: 900pt;
    .head-1{
        padding: 40px;
    }
@@ -1771,7 +1811,7 @@
    }
}
.bodycss{
        // margin-left: 85px;
        margin-left: 85px;
}
.bodycs{
    // margin-left: 135px;

 src/views/quality/finishedProductInspection/index.vue

@@ -217,19 +217,19 @@
            },
            //打印按钮
            printFun() {
                const printSettings = {
                        paper: {
                        width: 827, // A4纸的宽度（单位：像素）
                        height: 595, // A4纸的高度（单位：像素）
                        orientation: 'portrait', // 竖向打印
                        }}
                // const printSettings = {
                //         paper: {
                //         width: 827, // A4纸的宽度（单位：像素）
                //         height: 595, // A4纸的高度（单位：像素）
                //         orientation: 'portrait', // 竖向打印
                //         }}
                        
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    maxWidth: 1000,
                    printSettings,
                    style: '@page {margin: 2.0mm 2.0mm;size:A4;}',
                    // printSettings,
                    style: '@page {margin: 10mm 5mm;size:A4;}',
                    targetStyles: ["*"],
                    ignoreElements: ["no-ignore"],
                    orientation: 'portrait'

 vue.config.js

@@ -2,7 +2,7 @@
 * 配置参考:
 * https://cli.vuejs.org/zh/config/
 */
// const url = 'http://192.168.0.23:9999'
const url = 'http://192.168.0.23:9999'

  // const url = 'http://192.168.0.60:9999'
  const url = 'http://localhost:9999'