8.24 新增委托修改

yuyu

2023-08-24 19075f614d3dadc04456b8fd053a7e85f8f28307

8.24 新增委托修改

 .env.development

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

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

 .env.production

@@ -3,5 +3,5 @@

# base api
# VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = 'http://192.168.110.254:1234/'
VUE_APP_BASE_API = 'http://192.168.110.167:1234/'


 .env.staging

@@ -5,6 +5,6 @@

# base api
# VUE_APP_BASE_API = '/stage-api'
VUE_APP_BASE_API = 'http://192.168.110.87:1234/'
VUE_APP_BASE_API = 'http://192.168.110.167:1234/'



 package.json

@@ -26,6 +26,7 @@
    "path-to-regexp": "2.4.0",
    "postcss-pxtorem": "^5.1.1",
    "vue": "2.6.10",
    "vue-clipboard2": "^0.3.3",
    "vue-router": "3.0.6",
    "vuex": "3.1.0"
  },

 src/main.js

@@ -7,6 +7,8 @@
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
import VueClipboard from 'vue-clipboard2'
Vue.use(VueClipboard)

import '@/styles/index.scss' // global css

@@ -50,6 +52,7 @@

Vue.config.productionTip = false


new Vue({
  el: '#app',
  router,

 src/router/index.js

@@ -42,6 +42,11 @@
    hidden: true
  },
  {
    path: '/addCommision',
    component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
    hidden:true
  },
  {
    path: '/',
    component: Layout,
    redirect: '/home',
@@ -165,15 +170,15 @@
        name: 'CommissionInspection',
        component: () => import('@/views/inspectionManagement/commissionInspection/index'),
        meta: { title: '委托检验', icon: 'table' },
        children: [
          {
            path: 'addCommision',
            name: 'AddCommision',
            hidden: true,
            component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
            meta: { title: '检测信息', icon: 'table' }
          }
        ]
        // children: [
        //   {
        //     path: 'addCommision',
        //     name: 'AddCommision',
        //     hidden: true,
        //     component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
        //     meta: { title: '检测信息', icon: 'table' }
        //   }
        // ]
      },
      {
        path: 'reportForInspection',

 src/views/experiment/checkTheReport/index.vue

@@ -1,27 +1,33 @@
<template>
  <div class="content-main">
    <div class="top-bar">
      <el-form ref="form" :inline="true">
        <el-form-item class="sermargin">
      <el-form ref="form" :inline="true" :model="searchData" label-position="left">
        <el-form-item label="样品编号:">
          <el-input
            v-model="input"
            v-model="searchData.sample_code"
            class="input-form"
            placeholder="请直接输入样式编号/报告单号/样品编号/进行搜索或下拉选择进行组合查询"
            placeholder="请输入样品编号"
            @keyup.enter.native="getData"
          />
        </el-form-item>
        <el-form-item label="报告单号:">
          <el-input
            v-model="searchData.reportCode"
            class="input-form"
            placeholder="请输入报告单号"
          />
        </el-form-item>
        <el-form-item label="申请单号:">
          <el-input
            v-model="searchData.application_code"
            class="input-form"
            placeholder="请输入申请单号"
          />
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="getData()">查询</el-button>
          <el-button type="primary" plain @click="resetData()">重置</el-button>
        </el-form-item>
        <el-dropdown>
          <span class="el-dropdown-link">
            高级搜索<i class="el-icon-arrow-down el-icon--right"></i>
          </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item>高级搜索</el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
      </el-form>
      <el-form>
        <el-button class="rightBtn" type="primary" icon="el-icon-document"
@@ -36,7 +42,8 @@
            <el-radio-button>全部</el-radio-button>
            <el-radio-button label="0">待提交</el-radio-button>
            <el-radio-button label="1">待审核</el-radio-button>
            <el-radio-button label="2">已审核</el-radio-button>
            <el-radio-button label="2">待签字</el-radio-button>
            <el-radio-button label="3">已完成</el-radio-button>
          </el-radio-group>

          <el-checkbox v-model="checked" style="margin-left: 20px"
@@ -165,7 +172,11 @@
export default {
  data() {
    return {
      input: "",
      searchData:{
        sample_code:'',
        reportCode:'',
        application_code: ''
      },
      checkStatus: undefined,
      reportTable: [],
      page: 1,
@@ -196,7 +207,11 @@
    },
    // 重置按钮
    resetData() {
      this.input = undefined;
      this.searchData={
        sample_code:'',
        reportCode:'',
        application_code: ''
      },
      this.page = 1;
      this.pageSize = 10;
      this.checkStatus = undefined;
@@ -207,7 +222,7 @@
      const params = {
        page: this.page,
        pageSize: this.pageSize,
        name: this.input ? this.input : undefined,
        name: this.searchData.sample_code ? this.searchData.sample_code : undefined,
        status: this.checkStatus ? this.checkStatus : undefined,
      };
      const { data } = await selectAllReport(params);
@@ -226,7 +241,8 @@
  justify-content: space-between;
  padding: 5px 24px 0px 24px;
  .input-form {
    width: 700px;
    width: 250px;
    margin-right: 30px;
  }
  .el-dropdown-link {
    cursor: pointer;

 src/views/inspectionManagement/commissionInspection/addCommision.vue

@@ -107,7 +107,7 @@
            <el-col :span="12">基本信息</el-col>
            <el-col :span="12" style="text-align: right;">
            <!-- 点击返回，当前页面值为false -->
            <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">打印委托单</el-button>
            <!-- <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">打印委托单</el-button> -->
            </el-col>
        </el-row>
            <el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="right" label-width="100px" size="mini" >
@@ -193,6 +193,8 @@
                    </div>
                    <div class="submitBtn">
                      <el-button type="primary" size="small" @click="submitInspection" style="background-color: rgb(1, 102, 226);">提交</el-button>
                      <!-- 点击返回，当前页面值为false -->
                      <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">打印委托单</el-button>
                    </div>
                </el-form>
      </div>
@@ -478,6 +480,12 @@
</script>

<style lang="scss" scoped>
.content-main{
  padding: 20px 40px;
  background-color: #f0f2f5;
  width: 100%;
  height: 100vh;

.firstBox{
  .title{
    padding:0px 10px 10px 10px;
@@ -518,12 +526,20 @@
  .submitBtn{
    display: flex;
    justify-content: end;
    margin-right: 156px;
    margin-right: 40px;
    margin-top: 20px;
  }
}
.infoForm{
  background-color: #fff;
  padding: 20px 50px;
  .formwrapper{
    margin: 20px 0px;
    padding-left: 30px;
    .el-row{
      margin: 10px 0px;
    }
  }
}
}
</style>

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -1,6 +1,6 @@
<template>
  <div>
    <div v-if="!showDetail">
    <div>
      <div class="content-main">
          <div class="top-bar">
              <el-form ref="form" :inline="true" :model="searchData">
@@ -35,8 +35,13 @@
                <el-button type="primary" plain @click="reset">重置</el-button>
              </el-form-item>
              </el-form>
              <el-form>
                <el-button class="rightBtn" type="primary" @click="goToaddCommision">新增委托</el-button>
              <el-form class="rightForm">
                  <!-- 显示新增委托的网址链接 -->
                <div v-show="showlinkDiv === true">
                  <span style="font-size: 12px;">{{ textToCopy }}</span>
                  <el-button type="text" @click="copyText" style="margin-left: 30px;">{{ copied ===false?'复制':'已复制' }}</el-button>
                </div>
                <el-button class="rightBtn" type="primary" @click="showLink">新增委托</el-button>
              </el-form>
          </div>
          <div class="library-table">
@@ -153,9 +158,6 @@
          </div>
      </div>
  </div>
    <div v-else>
      <router-view />
    </div>
  </div>
</template>

@@ -205,19 +207,33 @@
      currentPage: 1,
      pageSize: 5,
      total: 100,
      showDetail: false
      showlinkDiv: false,
      copied: false,
      textToCopy: 'http://localhost:8080/#/addCommision'
    }
  },
  created() {
    this.getCommisionList()
  },
  updated() {
    if (this.$router.currentRoute.name === 'AddCommision') {
      // console.log(this.$router.currentRoute.name)
      this.showDetail = true
    }
  },
  // updated() {
  //   if (this.$router.currentRoute.name === 'AddCommision') {
  //     // console.log(this.$router.currentRoute.name)
  //     this.showDetail = true
  //   }
  // },
  methods: {
    copyText() {
      this.$copyText(this.textToCopy)
        .then(() => {
          this.copied = true;
          // setTimeout(() => {
          //   this.copied = false;
          // }, 2000);
        })
        .catch(error => {
          console.log('复制失败',error);
        });
    },
    async getCommisionList(){
      const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize})
      this.commisionTable = res.data.row
@@ -304,9 +320,8 @@
        this.total = res.data.total
      }
    },
    goToaddCommision() {
      this.$router.push('/inspectionManagement/commissionInspection/addCommision')
      this.showDetail = true
    showLink() {
      this.showlinkDiv = true
    }
  }
}
@@ -323,10 +338,26 @@
    .sermargin{
      margin-right: 60px;
    }
    .rightForm{
      display: flex;
      justify-content: space-between;
      /* background-color: #bfa; */
      height: 40px;
      line-height: 40px;
      >div{
        padding: 0px 10px;
        padding-bottom: 10px;
        border:1px solid rgb(8, 156, 230);
        margin-right: 10px;
        /* height: 40px;
        line-height: 40px; */
  }
.rightBtn{
    background-color: rgb(1, 102, 226);
}
    }
  }

.library-table{
      background-color: #fff;
      flex: 1;