zouyu
2023-11-22 a88c24cf840a39b20fe0fd8af0c0c549d4d0034a
Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
已修改3个文件
44 ■■■■ 文件已修改
src/views/quality/finishedProductInspection/finishedProducter-print.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/finishedProductInspection/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/teststandard/index.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -304,21 +304,25 @@
                    </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>
                            <span style="font-size:12pt;font-family:宋体;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
                        </div>
                    </div>
                </div>
                <div class="bodycss">
                    <div class="bodycs">
                        <p class=x1111111><span>检 测 报 告<br>
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                            <div style="display: flex;">
                            <span class=x1111112 style="margin-left: 40px;">报告编号:(No):ZTMS01-<br>Report No.:</span>
                            <span class=x1111112 style="margin-left: 335px;" >Test  &nbsp; Report</span>
                            <span class=x1111112 style="margin-left: 335px">页次:3/8<br> Page</span>
                            </div>
                        </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>
                    <div style="margin-top: 70px;">
                        <p class="x1111113" ><span style="display: flex;margin-top: 40px;margin-left: 40px;">报告正文:</span></p>
                    </div>
                    <div class="bodycs" style="margin-top: 80px;">
src/views/quality/finishedProductInspection/index.vue
@@ -218,10 +218,10 @@
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    // scanStyles: false,
                    maxWidth: 1000,
                    // header: "产品检测报告",
                    style:style,
                    // scanStyles: false,
                    targetStyles: ["*"],
                    ignoreElements: ["no-ignore"],
                    orientation: 'portrait'
src/views/quality/teststandard/index.vue
@@ -78,7 +78,7 @@
                align="center"
                width="50"
              />
              <el-table-column
              <!-- <el-table-column
                label="是否引用工艺参数"
                prop="isReference"
                align="center"
@@ -125,7 +125,7 @@
                <template slot-scope="scope">
                  <el-input v-model="scope.row.wireCore"></el-input>
                </template>
              </el-table-column>
              </el-table-column> -->
              <el-table-column label="参数编号" prop="code" align="center" />
              <el-table-column
                label="参数项"
@@ -188,8 +188,28 @@
                <template slot-scope="scope">
                  <el-input v-model="scope.row.parameterFormat"></el-input>
                </template>
              </el-table-column><el-table-column
                label="测试方法"
                prop="purpose"
                align="center"
                width="80"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.purpose"></el-input>
                </template>
              </el-table-column>
              <el-table-column
                label="测试目的"
                prop="method"
                align="center"
                width="80"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.method"></el-input>
                </template>
              </el-table-column>
              <!-- <el-table-column
                label="通道"
                prop="aisle"
                align="center"
@@ -208,7 +228,7 @@
                <template slot-scope="scope">
                  <el-input v-model="scope.row.position"></el-input>
                </template>
              </el-table-column>
              </el-table-column> -->
              <el-table-column label="单位" prop="unit" align="center" />
              <!--<el-table-column label="参数类型" prop="type" align="center" :formatter="getParam"/>-->
              <el-table-column label="操作" align="center">