From 8635253d498ea4fefd6ea465704569ff34fed3f8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 08 九月 2023 14:41:13 +0800
Subject: [PATCH] 	modified:   src/api/basicData/index.js 	modified:   src/views/experiment/inspectionApplication/index.vue 	modified:   src/views/experiment/nonConformingFeedback/index.vue 	modified:   src/views/experiment/reportAuditing/index.vue 	modified:   src/views/standardLibrary/index.vue

---
 src/views/experiment/nonConformingFeedback/index.vue |  140 ++++++++++++++++++++--------------------------
 1 files changed, 60 insertions(+), 80 deletions(-)

diff --git a/src/views/experiment/nonConformingFeedback/index.vue b/src/views/experiment/nonConformingFeedback/index.vue
index 2c58565..be7ad14 100644
--- a/src/views/experiment/nonConformingFeedback/index.vue
+++ b/src/views/experiment/nonConformingFeedback/index.vue
@@ -1,27 +1,20 @@
 <template>
   <div class="content-main">
     <div class="top-bar">
-      <el-form ref="form" style="width: 1000px;" :inline="true">
-        <!-- <el-input v-model="input" class="input-form" placeholder="璇风洿鎺ヨ緭鍏ユ牱寮忕紪鍙�/鏍峰搧鍚嶇О/鍨嬪彿瑙勬牸/杩涜鎼滅储鎴栦笅鎷夐�夋嫨杩涜缁勫悎鏌ヨ"
-            @keyup.enter.native="getData" /> -->
-        <el-form-item style="width: 800px;">
-          <el-col style="display: flex; justify-content: space-around;" :span="8">
-            <el-row>鏍峰紡缂栧彿:</el-row>
-            <el-row><el-input size="small" v-model="materialCode" placeholder="璇疯緭鍏ユ牱寮忕紪鍙�"></el-input></el-row>
-          </el-col>
-          <el-col style="display: flex; justify-content: space-around;" :span="8">
-            <el-row>鏍峰紡鍚嶇О:</el-row>
-            <el-row><el-input size="small" v-model="materialName" placeholder="璇疯緭鍏ユ牱寮忓悕绉�"></el-input></el-row>
-          </el-col>
-          <el-col style="display: flex; justify-content: space-around;" :span="8">
-            <el-row>鐢宠鍗曞彿:</el-row>
+      <el-form ref="form" style="width: 100%;margin-top: 10px;" :inline="true">
+          <el-form-item label="鏍峰紡缂栧彿锛�">
+            <el-input size="small" v-model="materialCode" placeholder="璇疯緭鍏ユ牱寮忕紪鍙�"></el-input>
+          </el-form-item>
+          <el-form-item label="鏍峰紡鍚嶇О锛�">
+            <el-input size="small" v-model="materialName" placeholder="璇疯緭鍏ユ牱寮忓悕绉�"></el-input>
+          </el-form-item>
+        <el-form-item label="鐢宠鍗曞彿锛�">
             <el-row><el-input size="small" v-model="inspectionCode" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�"></el-input></el-row>
-          </el-col>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getData()">鏌ヨ</el-button>
           <el-button type="primary" size="small" plain @click="resetData()">閲嶇疆</el-button>
-          <el-dropdown style="margin-left: 7px;">
+          <!-- <el-dropdown style="margin-left: 7px;">
             <span class="el-dropdown-link">
               楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right"></i>
             </span>
@@ -32,17 +25,17 @@
               <el-dropdown-item disabled>鍙岀毊濂�</el-dropdown-item>
               <el-dropdown-item divided>铓典粩鐓�</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
         </el-form-item>
       </el-form>
-      <el-form>
-        <el-button size="40" type="primary">鎵归噺鎻愪氦</el-button>
+      <el-form style="margin-top: 10px;">
+        <el-button size="small" type="primary">鎵归噺鎻愪氦</el-button>
       </el-form>
     </div>
     <div class="library-table">
       <div class="table-box">
-        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
-          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'left' }"
+          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
           :data="tableData" style="width: 100%">
           <el-table-column type="selection" label="" min-width="5%" />
           <el-table-column  label="鏍峰搧缂栧彿" min-width="10%">
@@ -140,68 +133,55 @@
 </script>
 
 <style lang="scss" scoped>
-.top-bar {
-  margin: -25px -15px;
-  background: #fff;
-  display: flex;
-  justify-content: space-between;
-  padding: 5px 24px 0px 24px;
-
-  .input-form {
-    width: 800px;
-  }
-
-  .el-dropdown-link {
-    cursor: pointer;
-    color: #409EFF !important;
-  }
-
-  .el-icon-arrow-down {
-    font-size: 12px !important;
-  }
-
-
-}
-
-.library-table {
-  background-color: #fff;
-  flex: 1;
-  margin: 0px -15px;
-  margin-top: 40px;
-  display: flex;
-  flex-direction: column;
-
-  .table-header {
-    padding: 20px;
-    display: flex;
-    justify-content: space-between;
-
-    .el-form-item {
-      margin-bottom: 30px !important;
-    }
-  }
-
-  .table-box {
-    padding: 0px 20px;
-    margin-top: 20px;
-    flex: 1;
-    background: #fff;
-    display: flex;
-    flex-direction: column;
-
-    >div:nth-child(2) {
-      display: flex;
-      justify-content: end;
-      margin: 10px 0;
-    }
-
-  }
-}
-</style>
-<style >
 .content-main {
   .el-form .el-form-item .el-form-item__content {
     width: 100% !important;
   }
+  .top-bar {
+    margin: -25px -15px;
+    background: #fff;
+    display: flex;
+    justify-content: space-between;
+    padding: 5px 24px 0px 24px;
+    .input-form {
+      width: 800px;
+    }
+    .el-dropdown-link {
+      cursor: pointer;
+      color: #409EFF !important;
+    }
+    .el-icon-arrow-down {
+      font-size: 12px !important;
+    }
+  }
+  .library-table {
+    background-color: #fff;
+    flex: 1;
+    margin: 0px -15px;
+    margin-top: 40px;
+    display: flex;
+    flex-direction: column;
+    .table-header {
+      padding: 20px;
+      display: flex;
+      justify-content: space-between;
+      .el-form-item {
+        margin-bottom: 30px !important;
+      }
+    }
+    .table-box {
+      padding: 0px 20px;
+      margin-top: 20px;
+      flex: 1;
+      background: #fff;
+      display: flex;
+      flex-direction: column;
+      >div:nth-child(2) {
+        display: flex;
+        justify-content: end;
+        margin: 10px 0;
+      }
+    }
+  }
 }
 </style>

--
Gitblit v1.9.3