From 2260184afb85c80eabce02da190f9f07ee660ab3 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期二, 08 八月 2023 14:35:57 +0800
Subject: [PATCH] 委托检验、原材料报检和检验申请页面

---
 src/views/inspectionManagement/commissionInspection/addCommision.vue |  181 +++++++++++++++++++++++++++++----------------
 1 files changed, 116 insertions(+), 65 deletions(-)

diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index e0999c0..9d65ee3 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -1,24 +1,26 @@
 <template>
   <div class="content-main">
     <div class="firstBox">
-      <span>妫�娴嬩俊鎭�</span>
-      <div tableBox>
-        <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">娣诲姞鏍峰搧</el-button>
+      <div class="title">妫�娴嬩俊鎭�</div>
+      <div class="tableBox">
+        <div class="tableBox-header">
+        <el-button class="split" type="primary" size="small" style="background-color: rgb(1, 102, 226);">娣诲姞鏍峰搧</el-button>
         <el-input
           v-model="searchData"
-          class="input-form"
+          class="input-form split"
           placeholder="鎵弿浜岀淮鐮佸綍鍏ユ牱鍝�..."
           prefix-icon="el-icon-search"
           style="width: 200px;"
         >
         </el-input>
         <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">閲嶇疆</el-button>
+      </div>
         <el-table
-                ref="commisionTable"
+                ref="detectionInfo"
                 :max-height="800"
                 :cell-style="{textAlign: 'center'}"
                 :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
-                :data="commisionTable"
+                :data="detectionInfo"
                 style="width: 100%"
               >
                 <el-table-column
@@ -27,24 +29,14 @@
                   min-width="10%"
                 />
                 <el-table-column
-                  prop="commisioncode"
-                  label="濮旀墭缂栧彿"
-                  min-width="8%"
-                />
-                <el-table-column
-                  prop="department"
-                  label="濮旀墭鍗曚綅"
-                  min-width="10%"
-                />
-                <el-table-column
-                  prop="samplecode"
+                  prop="sampleid"
                   label="鏍峰搧缂栧彿"
                   min-width="8%"
                 />
                 <el-table-column
                   prop="samplename"
                   label="鏍峰搧鍚嶇О"
-                  min-width="8%"
+                  min-width="10%"
                 />
                 <el-table-column
                   prop="modelandspecification"
@@ -52,28 +44,34 @@
                   min-width="10%"
                 />
                 <el-table-column
-                  prop="arrivetime"
-                  label="閫佽揪鏃堕棿"
+                  prop="unit"
+                  label="鍗曚綅"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="deadline"
-                  label="瀹屾垚鏈熼檺"
+                  prop="amount"
+                  label="鏁伴噺"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="person"
-                  label="濮旀墭缂栧埗浜�"
+                  prop="addway"
+                  label="娣诲姞鏂瑰紡"
+                  min-width="8%">
+                  <template slot-scope="scope">
+                  <el-tag
+                    :type="scope.row.addway === 0 ? 'success' : 'primary'"
+                    disable-transitions
+                  >{{ scope.row.addway === 0 ? '鎵弿' : '褰曞叆' }}</el-tag>
+                </template>
+                </el-table-column>
+                <el-table-column
+                  prop="experiment"
+                  label="璇曢獙"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="checkdate"
-                  label="妫�楠屾棩鏈�"
-                  min-width="8%"
-                />
-                <el-table-column
-                  prop="state"
-                  label="鐘舵��"
+                  prop="other"
+                  label="澶囨敞"
                   min-width="8%"
                 />
                 <el-table-column
@@ -81,6 +79,7 @@
                   min-width="8%"
                 >
                   <template slot-scope="scope">
+                    <el-button type="text" size="small">淇敼</el-button>
                     <el-button type="text" size="small" @click="handleClick(scope.row)">鍒犻櫎</el-button>
                   </template>
                 </el-table-column>
@@ -88,6 +87,7 @@
               <!-- 鍒嗛〉鍣� -->
               <div>
                 <el-pagination
+                  class="pagination"
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="currentPage"
@@ -106,43 +106,43 @@
                     <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="left" label-width="100px" size="mini" >
+                <el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="right" label-width="100px" size="mini" >
                     <div class="formwrapper">
-                        <el-row :gutter="50">
-                        <el-col :span="12">
+                        <el-row :gutter="200">
+                        <el-col :span="5">
                         <el-form-item label="濮旀墭缂栧彿锛�">
-                            <el-input style="width: 100px;" v-model="infoForm.commisioncode" placeholder="璇疯緭鍏ヨ鍗曞彿" readonly autocomplete="off" />  
+                            <el-input style="width: 160px" type="text" :value="infoForm.commisioncode" readonly disabled="true" autocomplete="off" />  
                         </el-form-item>
                         </el-col>
-                        <el-col :span="12">
+                        <el-col :span="5">
                         <el-form-item label="濮旀墭鍗曚綅锛�">
-                            <el-select style="width: 180px;" v-model="infoForm.department" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+                            <el-select style="width: 160px;" v-model="infoForm.department" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
                                 <el-option value="閫夐」1"></el-option>
                                 <el-option value="閫夐」2"></el-option>
                             </el-select>
                         </el-form-item>
                         </el-col>
-                        <el-col :span="12">
+                        <el-col :span="5">
                         <el-form-item label="鑱旂郴浜猴細">
-                            <el-select style="width: 180px;" v-model="infoForm.contacter" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+                            <el-select style="width: 160px;" v-model="infoForm.contacter" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
                                 <el-option value="閫夐」1"></el-option>
                                 <el-option value="閫夐」2"></el-option>
                             </el-select>
                         </el-form-item>
                         </el-col>
-                        <el-col :span="12">
+                        <el-col :span="5">
                         <el-form-item label="鑱旂郴鐢佃瘽锛�">
-                            <el-select style="width: 180px;" v-model="infoForm.tel" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+                            <el-select style="width: 160px;" v-model="infoForm.tel" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
                                 <el-option value="閫夐」1"></el-option>
                                 <el-option value="閫夐」2"></el-option>
                             </el-select>
                         </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-row :gutter="450">
+                    <el-row :gutter="200">
                         <el-col :span="5">
                         <el-form-item label="鑱旂郴鍦板潃锛�" >
-                            <el-select style="width: 180px;" v-model="infoForm.address" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+                            <el-select style="width: 160px;" v-model="infoForm.address" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
                                 <el-option value="閫夐」1"></el-option>
                                 <el-option value="閫夐」2"></el-option>
                             </el-select>
@@ -154,7 +154,7 @@
                               v-model="infoForm.deadline"
                               type="date"
                               placeholder="閫夋嫨鏃ユ湡"
-                              style="width: 180px;">
+                              style="width: 160px;">
                             </el-date-picker>
                           </el-form-item>
                         </el-col>
@@ -164,41 +164,44 @@
                               v-model="infoForm.time"
                               type="date"
                               placeholder="閫夋嫨鏃ユ湡"
-                              style="width: 180px;">
+                              style="width: 160px;">
                             </el-date-picker>
                         </el-form-item>
                         </el-col>
                         <el-col :span="5">
                         <el-form-item label="閫佹牱鏂瑰紡锛�">
-                          <el-select style="width: 180px;" v-model="infoForm.way" size="small" placeholder="閫佹牱">
+                          <el-select style="width: 160px;" v-model="infoForm.way" size="small" placeholder="閫佹牱">
                                 <el-option value="閫夐」1"></el-option>
                                 <el-option value="閫夐」2"></el-option>
                             </el-select>
                         </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-row :gutter="450">
+                    <el-row :gutter="200">
                         <el-col :span="5">
                         <el-form-item label="閫佹牱浜猴細" >
-                          <el-input style="width: 180px;" v-model="infoForm.sender" placeholder="璇疯緭鍏ラ�佹牱浜�" autocomplete="off" />
+                          <el-input style="width: 160px;" v-model="infoForm.sender" placeholder="璇疯緭鍏ラ�佹牱浜�" autocomplete="off" />
                         </el-form-item>
                         </el-col>
                         <el-col :span="5">
                         <el-form-item label="閫佹牱浜虹數璇濓細" >
-                          <el-input style="width: 180px;" v-model="infoForm.sendertel" placeholder="璇疯緭鍏ラ�佹牱浜虹數璇�" autocomplete="off" />
+                          <el-input style="width: 160px;" v-model="infoForm.sendertel" placeholder="璇疯緭鍏ラ�佹牱浜虹數璇�" autocomplete="off" />
                         </el-form-item>
                         </el-col>
                         <el-col :span="5">
                         <el-form-item label="鎶ュ憡鏁帮細">
-                            <el-input style="width: 180px;" v-model="infoForm.num" placeholder="璇疯緭鍏ユ姤鍛婃暟" autocomplete="off" />
+                            <el-input style="width: 160px;" v-model="infoForm.num" placeholder="璇疯緭鍏ユ姤鍛婃暟" autocomplete="off" />
                         </el-form-item>
                         </el-col>
                         <el-col :span="5">
                         <el-form-item label="濮旀墭澶囨敞锛�">
-                            <el-input style="width: 180px;" v-model="infoForm.other" placeholder="澶囨敞" autocomplete="off" />
+                            <el-input style="width: 160px;" v-model="infoForm.other" placeholder="澶囨敞" autocomplete="off" />
                         </el-form-item>
                         </el-col>
                     </el-row>
+                    </div>
+                    <div class="submitBtn">
+                      <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">鎻愪氦</el-button>
                     </div>
                 </el-form>
       </div>
@@ -210,9 +213,10 @@
 export default {
   data() {
     return {
+      currentPage: 0,
       searchData: '',
-      infoForm: [{
-        commisioncode: '',
+      infoForm: {
+        commisioncode: 'ST9162324',
         department: '',
         contacter: '',
         tel: '',
@@ -224,31 +228,78 @@
         sendertel: '',
         num: '',
         other: ''
+      },
+      detectionInfo: [{
+        sampleid: 'GW31478631',
+        samplename: '缁濈紭鏉�',
+        modelandspecification: 'JLHA/G1A-185/30-26/7',
+        unit: '鏍�',
+        amount: '40',
+        addway: 0,
+        experiment: '浜ゆ祦鑰愬帇璇曢獙',
+        other: '123',
+        opertion: '',
       }]
     }
   },
   methods: {
-    handleSelectionChange(val) {
-      console.log(val)
-      this.radioSelected = val.number // 閫変腑琛岀殑number
-      this.multipleSelection = val // 閫変腑鐨勪竴琛屾暟鎹�
-    },
     handleSizeChange(pageSize) {
       this.pageParams.pageSize = pageSize
     },
     handleCurrentChange(pageNo) {
       this.pageParams.pageNo = pageNo
-    },
-    headerBg({ row, rowIndex }) {
-      console.log('rowIndex', rowIndex)
-      if (rowIndex === 0) {
-        return 'headerBgClass'
-      }
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
+.firstBox{
+  .title{
+    padding:0px 10px 10px 10px;
+  }
+  .tableBox{
+    background-color: #fff;
+    padding: 0px 20px;
+    margin: 0px -15px;
+    flex: 1;
+    background: #fff;
+    /* padding: 20px 20px 10px 20px; */
+    display: flex;
+    flex-direction: column;
+    .tableBox-header{
+      padding: 20px 0px;
+      .split{
+        margin-right: 15px;
+      }
+    }
+          .el-table {
+            flex: 1;
+          }
+          >div:nth-child(3){
+            display: flex;
+            justify-content: end;
+            margin: 10px 0;
+          }
+  }
+}
+.secondBox{
+  margin: 0px -15px;
+  .header{
+    display: flex;
+    justify-content: space-between;
+    padding: 10px 20px;
+    margin-top: 10px;
+  }
+  .submitBtn{
+    display: flex;
+    justify-content: end;
+    margin-right: 156px;
+    margin-top: 20px;
+  }
+}
+.infoForm{
+  background-color: #fff;
+  padding: 20px 50px;
+}
 </style>

--
Gitblit v1.9.3