2024-05-24

功能优化
2 years ago · 72e151fe8c
7 changed files with 89 additions and 104 deletions
--- a/index.html
+++ b/index.html
@ -5,6 +5,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta http-equiv="X-UA-Compatible" content="ie=edge">
  <title>Checkpoint MES</title>
+<!--  <title>旭捷 MES</title>-->
  <% if (process.env.NODE_ENV === 'production') { %>
  <!-- 生产环境 -->
  <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@ -160,7 +160,8 @@ export const uploadSopFile = data => createAPI(`/pms/qc/upload`,'post',data)
 export const getSiteAndBuByUserName = data => createAPI(`/pms/qc/getSiteAndBuByUserName`,'post',data)
 export const searchSeqInfo = data => createAPI(`/pms/qc/searchSeqInfo`,'post',data)
 export const searchPartInfo = data => createAPI(`/pms/qc/searchPartInfo`,'post',data)
-
+// 获取采购类型
+export const orderTypeSearch = data => createAPI(`/pms/qc/orderTypeSearch`,'post',data)



--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@ -1,10 +1,16 @@
+
 <template>
  <div class="site-wrapper site-page--login">
-    <div class="site-content__wrapper">
-      <div class="site-content">
-        <div class="login-main">
+    <div style="display: flex;height: 100vh">
+      <div class="login-bg"></div>
+      <div style="width: 20%">
+        <div style="height: 27vh;">
+          <div style="text-align: right;padding: 0px 40px">
+            <img width="50%" height="72" style="object-fit: contain" src="~@/assets/img/ckp.png">
+          </div>
+        </div>
+        <div style="padding: 10px 40px">
          <h3 class="login-title">用户登陆</h3>
-
          <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" status-icon>
            <el-form-item prop="userName">
              <el-input v-model="dataForm.userName" placeholder="帐号"></el-input>
@ -13,13 +19,14 @@
              <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
            </el-form-item>
            <el-form-item>
-              <el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
+              <el-button style="width: 100%" type="primary" @click="dataFormSubmit()">登录</el-button>
            </el-form-item>
          </el-form>
        </div>
      </div>
    </div>
  </div>
+
 </template>

 <script>
@ -116,95 +123,28 @@ import { getUUID } from '@/utils'
 </script>

 <style lang="scss" scoped>
-  .site-wrapper.site-page--login {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    background-color: rgba(38, 50, 56, 0);
-    overflow: hidden;
-    &:before {
-      position: fixed;
-      top: 0;
-      left: 0;
-      z-index: -1;
-      width: 80%;
-      height: 100%;
-      content: "";
-      background-image: url(~@/assets/img/login_bg.jpg);
-      background-size: cover;
-    }
-    .site-content__wrapper {
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-      padding: 0;
-      margin: 0;
-      overflow-x: hidden;
-      overflow-y: auto;
-      background-color: transparent;
-    }
-    .site-content {
-      min-height: 100%;
-      padding: 15% 500px 30px 30px;
-    }
-    .brand-info {
-      margin: 220px 100px 0 90px;
-      color: #fff;
-    }
-    .brand-info__text {
-      margin:  0 0 22px 0;
-      font-size: 48px;
-      font-weight: 400;
-      text-transform : uppercase;
-    }
-    .brand-info__intro {
-      margin: 10px 0;
-      font-size: 16px;
-      line-height: 1.58;
-      opacity: .6;
-    }
-    .login-main {
-      position: absolute;
-      top: 0;
-      right: 0;
-      padding: 15% 60px 180px;
-      width: 350px;
-      min-height: 100%;
-      background-color: #fff;
-    }
-    .login-title {
-      font-size: 30px;
-    }
-    .login-captcha {
-      overflow: hidden;
-      > img {
-        width: 100%;
-        cursor: pointer;
-      }
-    }
-    .login-btn-submit {
-      width: 100%;
-
-    }
-    .login-main .el-input__inner{
-      margin-top: 10px;
-      height: 45px;
-    }
-    .el-button--medium {
-      margin-top: 0px;
-      padding: 5px 11px;
-      font-size: 16px;
-      border-radius: 4px;
-    }
-    .el-form-item {
-      margin-bottom: 5px;
-    }
+.site-wrapper.site-page--login {
+  .login-title {
+    font-size: 30px;
  }
-
-
-
+  .login-main .el-input__inner{
+    margin-top: 10px;
+    height: 45px;
+  }
+  .el-button--medium {
+    margin-top: 0px;
+    padding: 5px 11px;
+    font-size: 16px;
+    border-radius: 4px;
+  }
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+.login-bg{
+  background-image: url(~@/assets/img/login_bg.jpg);
+  background-size: cover;
+  width: 80%;
+}
 </style>
+
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@ -25,7 +25,7 @@
 <!--         <icon-svg :name="this.$store.state.user.favorite?'xiangqufill':'xiangqu'" ></icon-svg>-->
 <!--        </span>-->
        <el-menu-item class="site-navbar__avatar" index="1">
-         <span class="el-dropdown-link" @click="userSetting">
+          <span class="el-dropdown-link" @click="userSetting">
            <icon-svg name="editTable" style="width: 25px;height: 25px;margin-top: 5px"></icon-svg>
          </span>
        </el-menu-item>
@ -57,6 +57,7 @@
          <el-dropdown :show-timeout="0" placement="bottom">
                      <span class="el-dropdown-link">
                        <img src="~@/assets/img/ckp.png" :alt="userName">{{ userName }}
+<!--                        <img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}-->
                      </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item @click.native="logoutHandle()">退出</el-dropdown-item>
@ -76,6 +77,7 @@
    <el-dialog append-to-body top="26vh" :show-close="false" :close-on-click-modal="true" v-drag :visible.sync="revisionModalFlag" width="335px">
      <div slot="title" style="text-align: center">
        <img src="~@/assets/img/ckp.png" style="width: 115px;height: 45px;vertical-align: middle;object-fit: contain;">
+<!--        <img src="~@/assets/img/avatar.png" style="width: 115px;height: 45px;vertical-align: middle;object-fit: contain;">-->
      </div>
      <div style="display: flex;justify-content: space-between;">
        <div class="aaa">
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@ -73,6 +73,16 @@
          </el-option>
        </el-select>
      </el-form-item>
+      <el-form-item :label="'采购类型'">
+        <el-select v-model="searchData.orderType" clearable style="width: 90px">
+          <el-option
+            v-for = "i in orderTypeList"
+            :key = "i.orderType"
+            :label = "i.orderType"
+            :value = "i.orderType">
+          </el-option>
+        </el-select>
+      </el-form-item>
    </el-form>
    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
      <el-form-item :label="'送检日期'">
@ -486,7 +496,8 @@
    iqcRecordDelete, // 删除检验记录
    disposalMeasuresSearch, // 获取处置措施列表
    iqcRecordOverLoad, // 重载检验单
-    getSiteAndBuByUserName
+    getSiteAndBuByUserName,
+    orderTypeSearch, // 获取采购类型
  } from "@/api/qc/qc.js"
  import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
  import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -561,6 +572,7 @@
          limit: 10,
          poOrderNo: '',
          poItemNo: '',
+          orderType: ''
        },
        pageIndex: 1,
        pageSize: 20,
@ -864,6 +876,24 @@
            fixed: '',
            columnWidth: 130,
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1OrderType',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'orderType',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '采购类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 301006,
@ -1367,6 +1397,7 @@
          samplingNumber: ''
        },
        disposalMeasuresOptions: [],
+        orderTypeList: [],
        userBuList: [],
        authSearch: false,
        authCheck: false,
@ -1391,6 +1422,7 @@
      this.getSiteAndBuByUserName()
      this.favoriteIsOk()
      this.disposalMeasuresSearch()
+      this.orderTypeSearch()
      // 动态列
      this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
@ -1475,6 +1507,15 @@
        })
      },

+      // 获取采购类型列表
+      orderTypeSearch () {
+        orderTypeSearch().then(({data}) => {
+          if (data.code === 0) {
+            this.orderTypeList = data.rows
+          }
+        })
+      },
+
      selectFlag () {
        return true
      },
--- a/src/views/modules/qc/qcItem.vue
+++ b/src/views/modules/qc/qcItem.vue
@ -1001,10 +1001,10 @@
          this.$message.warning('请选择检验方法！')
          return
        }
-        if ((this.modalData.samplingProgrammeNo === '' || this.modalData.samplingProgrammeNo == null) && (this.modalData.itemSamplingQuantity === '' || this.modalData.itemSamplingQuantity == null) && (this.modalData.defaultSamplingProportion === '' || this.modalData.defaultSamplingProportion == null)) {
-          this.$message.warning('抽样方案、抽样数量、抽样比例至少选择一项！')
-          return
-        }
+        // if ((this.modalData.samplingProgrammeNo === '' || this.modalData.samplingProgrammeNo == null) && (this.modalData.itemSamplingQuantity === '' || this.modalData.itemSamplingQuantity == null) && (this.modalData.defaultSamplingProportion === '' || this.modalData.defaultSamplingProportion == null)) {
+        //   this.$message.warning('抽样方案、抽样数量、抽样比例至少选择一项！')
+        //   return
+        // }
        if ((this.modalData.samplingProgrammeNo !== '' && this.modalData.samplingProgrammeNo != null) && (this.modalData.samplingLevelNo === '' || this.modalData.samplingLevelNo == null)) {
          this.$message.warning('请选择检验水平！')
          return
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@ -282,8 +282,8 @@
              @clear="blurForBug()"
              @select="handleSelect"
              :popper-append-to-body="false"
-              style="width: 210px"
-            ></el-autocomplete>
+              style="width: 210px">
+            </el-autocomplete>
          </template>
        </el-table-column>
        <el-table-column