Merge remote-tracking branch 'origin/master'

value

2023-08-29 46fc0a615143fbdb05a1e80be993d4dcbbe0b88d

Merge remote-tracking branch 'origin/master'

 .env.development

@@ -2,4 +2,4 @@
ENV = 'development'

# base api
VUE_APP_BASE_API =  'http://localhost:1234/'
VUE_APP_BASE_API =  'http://192.168.137.138:1234/'

 src/components/experiment/checkTheReport/index.vue

@@ -73,6 +73,7 @@
</template>
<script>
export default({
    name: 'Preview',
    data() {
        return {
            logoSrc : require("@/assets/404_images/logo.png"),    

 src/components/experiment/template_testReport/index.vue

ÎļþÃû´Ó src/views/template_testReport/index.vue ÐÞ¸Ä
@@ -30,7 +30,7 @@
          <div class="name">
            <div style="width:140px; text-align-last: justify;">
            <div>委托单位</div>
            <span style="font-size: 14px;display: block;margin: 10px 50px 0px;">Client</span>
            <span style="font-size: 14px;display: block;margin: 10px 45px 0px;">Client</span>
          </div>
            <div class="line"> æµ‹è¯•åç§°</div>
          </div>
@@ -469,9 +469,8 @@

<script>
export default {
  props:{

  },
  name:'TestReport',
  props:["reportData"],
  data(){
    return {
      resultTable:[
@@ -500,15 +499,13 @@

<style lang="scss" scoped>
.content-wrapper{
  background-color: #f0f2f5;
  width: 100%;
  height: 100vh;
  overflow-y: auto;
  // background-color: #f0f2f5;
  // width: 100%;
  // height: 100vh;
  // overflow-y: auto;
  .content-main{
    margin: -50px auto;
    width: 50%;
    // background-color: #fff;
    // background-color: #bfa;
    margin: -100px auto;
    width: 90%;
    .cover{
      margin: 80px 0px;
      padding:0px 50px;

 src/views/experiment/checkTheReport/index.vue

@@ -60,8 +60,8 @@
          <el-button type="primary" @click="printFun()">打印</el-button>
        </span>
        <div class="printStyle">
          <preview id="printDiv" :reportData="reportData" v-if="reportType===0"></preview>
          <div v-else>成品检测报告</div>
          <Preview id="printRaw" :reportData="reportData" v-if="reportType===0"></Preview>
          <TestReport id="printFinished" :reportData="reportData" v-else></TestReport>
        </div>
      </el-dialog>
      <div class="table-box">
@@ -182,6 +182,7 @@
<script>
import { selectAllReport,getReportData } from "@/api/experiment/checkTheReport";
import Preview from "@/components/experiment/checkTheReport/index.vue";
import TestReport from "@/components/experiment/template_testReport/index.vue"
import PrintJS from 'print-js'
export default {
  data() {
@@ -194,7 +195,26 @@
        application_code: ''
      },
      checkStatus: undefined,
      reportTable: [],
      reportTable: [
        {
          materialCode:'SN23-0517001',
          reportCode: 'SN23-0517001',
          inspectionCode: 'SN23-0517001',
          approver:'黄小明',
          status: '',
          conclusion: 1,
          name: '黄小明'
        },
        {
          materialCode:'SN23-0517001',
          reportCode: 'SN23-0517001',
          inspectionCode: 'SN23-0517001',
          approver:'黄小明',
          status: '',
          conclusion: 1,
          name: '黄小明'
        }
      ],
      page: 1,
      total: 0,
      pageSize: 10,
@@ -203,12 +223,13 @@
    };
  },
  created() {
    this.getData();
    // this.getData();
  },
  mounted(){
  },
  components:{
    Preview
    Preview,
    TestReport
  },
  methods: {
    async queryReportByRCode(code){
@@ -219,6 +240,7 @@
    },
    //查看报告按钮
    previewFun(row){
      console.log(row)
      this.reportType = row.type;
      this.queryReportByRCode(row.reportCode);
    },
@@ -226,7 +248,7 @@
    printFun(){
      this.dialogVisible = false;
      PrintJS({
        printable: "printDiv",
        printable: this.reportType===0 ? "printRaw" : "printFinished",
        type: "html",
        // header: "原材料检测报告",
        targetStyles: ["*"],

 src/views/laboratory/ledger/index.vue

@@ -249,7 +249,7 @@
              <el-form-item label="所属分类：" prop="classifyId" label-width="80" :rules="[
                { required: true, message: '请选择所属分类', trigger: 'change' }
              ]">
                <el-cascader v-model="equipmentform.classifyId" :options="classTree" :show-all-levels="false" />
                <el-cascader style="width: 100%;" v-model="equipmentform.classifyId" :options="classTree" :show-all-levels="false" />
              </el-form-item>
            </el-col>
            <el-col :span="11">