From 96f5e06ffbc743dae63db27064140832d752a3f9 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 二月 2025 19:48:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/components/Table/lims-table.vue                                           |   32 
 src/views/business/materialOrder/customsInspection.vue                        |    8 
 src/views/business/inspectionReview/index.vue                                 |   12 
 src/views/business/reportPreparation/index.vue                                |  953 ++++++++++----------------
 src/views/business/sample/components/detail.vue                               |  197 +++++
 src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue |    2 
 src/api/business/sample.js                                                    |   90 ++
 src/api/business/insReport.js                                                 |   50 +
 src/components/Table/value-table.vue                                          |    9 
 src/views/business/sample/index.vue                                           |  704 ++++++++++++++++++++
 10 files changed, 1,454 insertions(+), 603 deletions(-)

diff --git a/src/api/business/insReport.js b/src/api/business/insReport.js
index 70277c8..896d9b2 100644
--- a/src/api/business/insReport.js
+++ b/src/api/business/insReport.js
@@ -1,7 +1,7 @@
 // 鎶ュ憡缂栧埗椤甸潰鐩稿叧鎺ュ彛
 import request from '@/utils/request'
 
-// 鏌ヨ鍘熸潗鏂欎笅鍗�-寰呬笅鍗�
+// 鎶ュ憡杩樺師
 export function upReportUrl(query) {
   return request({
     url: '/insReport/upReportUrl',
@@ -9,3 +9,51 @@
     data: query
   })
 }
+// 鏌ヨ妫�楠屾姤鍛婃暟鎹�
+export function pageInsReport(query) {
+  return request({
+    url: '/insReport/pageInsReport',
+    method: 'get',
+    params: query
+  })
+}
+// 鎶ュ憡鎵归噺涓嬭浇
+export function downAll(query) {
+  return request({
+    url: '/insReport/downAll',
+    method: 'get',
+    params: query
+  })
+}
+// 鎶ュ憡閫�鍥炲埌妫�楠屼换鍔�
+export function sendBackTask(query) {
+  return request({
+    url: '/insReport/sendBackTask',
+    method: 'post',
+    data: query
+  })
+}
+// 鎶ュ憡瀹℃牳
+export function examineReport(query) {
+  return request({
+    url: '/insReport/examineReport',
+    method: 'post',
+    data: query
+  })
+}
+// 鎶ュ憡鎻愪氦
+export function writeReport(query) {
+  return request({
+    url: '/insReport/writeReport',
+    method: 'post',
+    data: query
+  })
+}
+// 鎶ュ憡鎵瑰噯
+export function ratifyReport(query) {
+  return request({
+    url: '/insReport/ratifyReport',
+    method: 'post',
+    data: query
+  })
+}
diff --git a/src/api/business/sample.js b/src/api/business/sample.js
new file mode 100644
index 0000000..0e83b2d
--- /dev/null
+++ b/src/api/business/sample.js
@@ -0,0 +1,90 @@
+// 鏍峰搧绠＄悊椤甸潰鐩稿叧鎺ュ彛
+import request from '@/utils/request'
+
+// 鏌ヨ浠撳簱
+export function selectWarehouse() {
+  return request({
+    url: '/warehouse/selectWarehouse',
+    method: 'get'
+  })
+}
+// 鏍峰搧鍏ュ簱
+export function inWarehouse(query) {
+  return request({
+    url: '/warehouse/inWarehouse',
+    method: 'post',
+    data: query
+  })
+}
+// 鏍峰搧鍑哄簱
+export function outWarehouse(query) {
+  return request({
+    url: '/warehouse/outWarehouse',
+    method: 'post',
+    data: query
+  })
+}
+// 淇敼浠撳簱
+export function upWarehouse(query) {
+  return request({
+    url: '/warehouse/upWarehouse',
+    method: 'post',
+    data: query
+  })
+}
+// 娣诲姞浠撳簱
+export function addWarehouse(query) {
+  return request({
+    url: '/warehouse/addWarehouse',
+    method: 'post',
+    data: query
+  })
+}
+// 淇敼璐ф灦
+export function upShelf(query) {
+  return request({
+    url: '/warehouse/upShelf',
+    method: 'post',
+    data: query
+  })
+}
+// 娣诲姞璐ф灦
+export function addShelf(query) {
+  return request({
+    url: '/warehouse/addShelf',
+    method: 'post',
+    data: query
+  })
+}
+// 鍒犻櫎浠撳簱
+export function delWarehouse(query) {
+  return request({
+    url: '/warehouse/delWarehouse',
+    method: 'delete',
+    params: query
+  })
+}
+// 鍒犻櫎璐ф灦
+export function delShelf(query) {
+  return request({
+    url: '/warehouse/delShelf',
+    method: 'delete',
+    params: query
+  })
+}
+// 鏌ヨ璐ф灦涓嬬殑瀛樻斁淇℃伅
+export function getWarehouse(query) {
+  return request({
+    url: '/warehouse/getWarehouse',
+    method: 'get',
+    params: query
+  })
+}
+// 鏌ヨ璐ф灦涓嬬殑瀛樻斁淇℃伅
+export function searchSampleId(query) {
+  return request({
+    url: '/warehouse/searchSampleId',
+    method: 'post',
+    data: query
+  })
+}
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 339a50f..05e1d85 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -12,7 +12,7 @@
       <el-table-column v-for="(item, index) in column" :key="index" :column-key="item.columnKey"
         :filter-method="item.filterHandler" :filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue"
         :filters="item.filters" :fixed="item.fixed" :label="item.label" :min-width="item.minWidth" :prop="item.prop"
-        :show-overflow-tooltip="item.dataType === 'action' ? false : true" :sortable="item.sortable ? true : false"
+        :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true" :sortable="item.sortable ? true : false"
         :type="item.type" :width="item.dataType === 'action' ? getWidth(item.operation) : item.width
           " align="center">
         <!-- <div class="123" v-if="item.type == ''"> -->
@@ -70,13 +70,21 @@
                 @click="o.clickFun(scope.row)" :key="key">
                 {{ o.name }}
               </el-button>
-              <el-upload action="#" size="mini" :on-change="(file, fileList) => o.clickFun(scope.row, file, fileList)
-                " :multiple="o.multiple ? o.multiple : false" :limit="o.limit ? o.limit : 1"
+              <el-upload
+                :action="javaApi + o.url +'?id=' +(o.uploadIdFun ? o.uploadIdFun(scope.row): scope.row.id) "
+                size="mini"
+                ref="upload"
+                :multiple="o.multiple ? o.multiple : false"
+                :limit="1"
                 :disabled="o.disabled ? o.disabled(scope.row) : false" :accept="o.accept
                   ? o.accept
                   : '.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
                   " v-if="o.type == 'upload'" style="display: inline-block; width: 50px"
-                v-show="o.showHide ? o.showHide(scope.row) : true" :auto-upload="false" :on-exceed="onExceed"
+                v-show="o.showHide ? o.showHide(scope.row) : true"
+                :headers="uploadHeader"
+                :on-error="onError"
+                :on-exceed="onExceed"
+                :on-success="handleSuccessUp"
                 :show-file-list="false" :key="key">
                 <el-button :size="o.size ? o.size : 'small'" type="text"
                   :disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
@@ -297,6 +305,22 @@
     setCurrent(row) {
       this.$refs.multipleTable.setCurrentRow();
     },
+    handleSuccessUp(response, label) {
+      if (typeof label === "string") {
+        if (response.code == 200) {
+          this.upData[label] = response.data.url;
+        }
+      } else {
+        if (response.code == 200) {
+          this.$message.success("涓婁紶鎴愬姛");
+        }
+      }
+    },
+    onError(err, file, fileList) {
+      this.$message.error("涓婁紶澶辫触");
+      this.$refs.upload.clearFiles();
+      this.uploading = false;
+    },
     onExceed() {
       this.$message.warning("瓒呭嚭鏂囦欢涓暟");
     },
diff --git a/src/components/Table/value-table.vue b/src/components/Table/value-table.vue
index 3647f3c..95aa411 100644
--- a/src/components/Table/value-table.vue
+++ b/src/components/Table/value-table.vue
@@ -243,14 +243,7 @@
                 v-else
                 ref="upload"
                 :accept="a.uploadConfig.accept"
-                :action="
-                  javaApi +
-                  a.uploadConfig.url +
-                  '?id=' +
-                  (a.uploadConfig.uploadIdFun
-                    ? a.uploadConfig.uploadIdFun(scope.row)
-                    : scope.row.id)
-                "
+                :action="javaApi + a.uploadConfig.url +'?id=' +(a.uploadConfig.uploadIdFun ? a.uploadConfig.uploadIdFun(scope.row): scope.row.id)"
                 :disabled="
                   a.disabFun ? a.disabFun(scope.row, scope.$index) : false
                 "
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index fcebf1b..7586d81 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -179,10 +179,12 @@
             },
             {
               name: "涓婁紶",
-              type: "text",
-              clickFun: (row) => {
-                this.handleUpload(row);
-              },
+              type: "upload",
+              accept: '.doc,.docx',
+              url: '/insReport/inReport',
+              uploadIdFun: (row) => {
+                return row.insReportId
+              }
             },
             {
               name: "杩樺師",
@@ -355,7 +357,7 @@
       })
     },
     // 涓婁紶鎶ュ憡
-    handleUpload () {
+    handleUpload (row) {
 
     },
     // 涓嬭浇鎶ュ憡
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 0f6f2c4..d303dc9 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -451,10 +451,6 @@
   dicts: ['check_type', 'urgency_level'],
   components: {},
   props: {
-    isReport: {
-      type: Number,
-      default: () => null
-    }
   },
   data() {
     return {
@@ -462,6 +458,7 @@
       orderType: '',
       active: 0,
       currentId: 0,
+      isReport: '',
       editTable:[], // 鍖洪棿鐗规畩鍊煎～鍐�
       template: null,
       saveLoad: false, // 淇濆瓨鎸夐挳loading
@@ -640,6 +637,7 @@
     this.active = this.$route.query.active
     this.orderType = this.$route.query.orderType
     this.currentId = this.$route.query.currentId
+    this.isReport = this.$route.query.isReport
     this.customsInspection = this.$route.query.customsInspection
     this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
     this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
@@ -698,7 +696,7 @@
           orderId = this.dataIndex === 0 ? this.customsInspection.enterOrderId : this.customsInspection.quarterOrderId
         } else if (!this.customsInspection.enterOrderId && !this.customsInspection.quarterOrderId) {
           this.isShowTab = false
-          orderId = this.isReport === 1 ? this.customsInspection.insOrderId : this.customsInspection.id
+          orderId = this.isReport == 1 ? this.customsInspection.insOrderId : this.customsInspection.id
         }
         // 鏌ョ湅
         // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
diff --git a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
index 2fb5e0a..db188d7 100644
--- a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
@@ -175,7 +175,7 @@
       this.upLoading = false;
       if (response.code == 200) {
         this.$message.success('涓婁紶鎴愬姛');
-        this.$refs.fileList.selectList()
+        this.getFileList()
       }
     },
     beforeUpload(file) {
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 3d9209a..60a78b9 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -1,138 +1,67 @@
 <template>
-  <div class="inspection_order">
-    <div v-show="activeFace === 0 && state===0" style="width: 100%;height: 100%;">
-      <div>
-        <el-row class="title">
-          <el-col :span="12" style="padding-left: 20px;text-align: left;">鎶ュ憡缂栧埗</el-col>
-        </el-row>
-      </div>
-      <div class="search" style="position: relative;">
-        <div class="search_thing">
-          <div class="search_label">鎶ュ憡缂栧彿锛�</div>
-          <div class="search_input"><el-input v-model="componentData.entity.code" clearable placeholder="璇疯緭鍏�"
-                                              size="small" @keyup.enter.native="refreshTable()"></el-input></div>
+  <div class="app-container">
+    <div>
+      <el-form :model="entity" ref="entity" size="small" :inline="true">
+        <el-form-item label="鎶ュ憡缂栧彿" prop="code">
+          <el-input v-model="entity.code" clearable placeholder="璇疯緭鍏�"
+                    size="small" @keyup.enter.native="refreshTable()"></el-input>
+        </el-form-item>
+        <el-form-item label="鐘舵��" prop="queryStatus">
+          <el-select v-model="entity.queryStatus" clearable size="small" @change="refreshTable()">
+            <el-option v-for="(a, i) in queryStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="涓嬪崟绫诲埆" prop="typeSource">
+          <el-select v-model="entity.typeSource" clearable size="small" @change="refreshTable()">
+            <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="妫�楠岀被鍒�" prop="orderType">
+          <el-select v-model="entity.orderType" clearable size="small" @change="refreshTable()">
+            <el-option v-for="(a, i) in orderTypeList" :key="i" :label="a.label" :value="a.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
+          <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
+          <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div>
+      <lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
+                  :isSelection="true" :handleSelectionChange="handleChange"
+                  :height="'calc(100vh - 290px)'" @pagination="pagination" key="valueTableData">
+        <div slot="action" slot-scope="scope">
+          <el-button size="small" type="text" @click="viewIssued(scope.row)">鏌ョ湅鎶ュ憡</el-button>
+          <el-upload ref='upload1'
+                     style="display: inline;margin: 0 6px"
+                     :action="fileAction1 +'?id='+ scope.row.id"
+                     :auto-upload="true"
+                     :before-upload="fileBeforeUpload1"
+                     :headers="uploadHeader" :on-error="onError1"
+                     :on-success="handleSuccessUp1"
+                     :show-file-list="false"
+                     accept='.doc,.docx'>
+            <el-button size="small" type="text" :disabled="scope.row.state != 0 || userName !== scope.row.writeUserName">涓婁紶</el-button>
+          </el-upload>
+          <el-button type="text" size="small" :disabled="scope.row.state != 0 || userName !== scope.row.writeUserName" @click="handleRestore(scope.row)">杩樺師</el-button>
+          <el-button type="text" size="small" :disabled="scope.row.state != 0 || userName !== scope.row.writeUserName" @click="sendBackTask(scope.row)">閫�鍥炰换鍔�</el-button>
+          <el-button type="text" size="small" :disabled="scope.row.state != 0 || userName !== scope.row.writeUserName" @click="handle(scope.row)">鎻愪氦</el-button>
+          <el-button type="text" size="small" :disabled="scope.row.state == null || scope.row.state == 0 ||scope.row.isExamine == 1 || userName !== scope.row.examineUser" @click="handleIssued(scope.row)">瀹℃牳</el-button>
+          <el-button type="text" size="small" :disabled="scope.row.state == null || scope.row.state == 0 || scope.row.isExamine == 0 || scope.row.isExamine == null || scope.row.isRatify == 1 || userName !== scope.row.ratifyUser" @click="handleApprove(scope.row)">鎵瑰噯</el-button>
+          <el-popover placement="bottom" trigger="hover" style="margin-left: 6px">
+            <template #reference>
+              <el-button link type="text" size="small">鏇村</el-button>
+            </template>
+            <div>
+              <el-button style="margin-left: 10px" type="text" size="small" @click="download(scope.row)">涓嬭浇</el-button>
+              <el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button>
+              <el-button type="text" size="small" @click="handleFileLook(scope.row)">闄勪欢涓婁紶</el-button>
+            </div>
+          </el-popover>
         </div>
-        <div class="search_thing">
-          <div class="search_label">鐘舵�侊細</div>
-          <div class="search_input">
-            <el-select v-model="componentData.entity.queryStatus" clearable size="small" style="width: 100%;" @change="refreshTable()">
-              <el-option v-for="(a, i) in queryStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="search_thing">
-          <div class="search_label">涓嬪崟绫诲埆锛�</div>
-          <div class="search_input">
-            <el-select v-model="componentData.entity.typeSource" clearable size="small" style="width: 100%;" @change="refreshTable()">
-              <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="search_thing">
-          <div class="search_label">妫�楠岀被鍒細</div>
-          <div class="search_input">
-            <el-select v-model="componentData.entity.orderType" clearable size="small" style="width: 100%;" @change="refreshTable()">
-              <el-option v-for="(a, i) in orderTypeList" :key="i" :label="a.label" :value="a.value"></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="search_thing" style="padding-left: 30px;">
-          <el-button size="small" @click="refresh()">閲� 缃�</el-button>
-          <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
-          <el-button :loading="outLoading" size="small" style="margin-right: 16px;" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
-        </div>
-      </div>
-      <!-- <input id="input" type="file" accept=".doc,.docx"></input> -->
-      <div class="table">
-        <el-table @selection-change="handleChange" :data="valueTableData" style="width: 100%" height="calc(100vh - 21em)" v-loading="tableLoading">
-          <!-- 琛ㄦ牸鍒� -->
-          <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column header-align="center" align="center" width="70" prop="prop" label="搴忓彿" type="index"></el-table-column>
-          <el-table-column prop="code" label="鎶ュ憡缂栧彿" min-width="180">
-            <template slot-scope="scope">
-              <el-button type="text" @click="selectAllByOne(scope.row)">{{scope.row.code}}</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column prop="typeSource" label="涓嬪崟绫诲埆" min-width="120">
-            <template slot-scope="scope">
-              <el-tag type="info" v-if="scope.row.typeSource === 1" disable-transitions>鍘熸潗鏂欎笅鍗�</el-tag>
-              <el-tag type="info" v-if="scope.row.typeSource === 0" disable-transitions>鎴愬搧涓嬪崟</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="orderType" label="妫�楠岀被鍒�" min-width="150">
-            <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.orderType === 'Customer-ordered test'" disable-transitions>濮旀墭璇曢獙</el-tag>
-              <el-tag v-if="scope.row.orderType === '鎶芥'" disable-transitions>鎶芥</el-tag>
-              <el-tag type="info" v-if="scope.row.orderType === '杩涘巶妫�楠�'" disable-transitions>杩涘巶妫�楠�</el-tag>
-              <el-tag type="warning" v-if="scope.row.orderType === 'Quarterly inspection'" disable-transitions>瀛ｅ害妫�楠�</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150"></el-table-column>
-          <el-table-column prop="writeUserName" label="鎻愪氦浜�" min-width="110"></el-table-column>
-          <el-table-column prop="writeTime" label="鎻愪氦鏃堕棿" min-width="150"></el-table-column>
-          <el-table-column prop="state" label="鎻愪氦鐘舵��" min-width="110">
-            <template slot-scope="scope">
-              <el-tag type="danger" v-if="scope.row.state === 0" disable-transitions>寰呮彁浜�</el-tag>
-              <el-tag type="success" v-if="scope.row.state === 1" disable-transitions>宸叉彁浜�</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="examineUser" label="瀹℃牳浜�" width="110"></el-table-column>
-          <el-table-column prop="examineTime" label="瀹℃牳鏃堕棿" width="180"></el-table-column>
-          <el-table-column prop="isExamine" label="瀹℃牳鐘舵��" width="110">
-            <template slot-scope="scope">
-              <el-tag type="danger" v-if="scope.row.isExamine === 0" disable-transitions>涓嶉�氳繃</el-tag>
-              <el-tag type="success" v-if="scope.row.isExamine === 1" disable-transitions>閫氳繃</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="examineTell" label="瀹℃牳澶囨敞" width="180"></el-table-column>
-          <el-table-column prop="ratifyUser" label="鎵瑰噯浜�" width="110"></el-table-column>
-          <el-table-column prop="ratifyTime" label="鎵瑰噯鏃堕棿" width="180"></el-table-column>
-          <el-table-column prop="isRatify" label="鎵瑰噯鐘舵��" width="110">
-            <template slot-scope="scope">
-              <el-tag type="danger" v-if="scope.row.isRatify === 0" disable-transitions>涓嶆壒鍑�</el-tag>
-              <el-tag type="success" v-if="scope.row.isRatify === 1" disable-transitions>鎵瑰噯</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="ratifyTell" label="鎵瑰噯澶囨敞" width="180"></el-table-column>
-          <!-- 鎿嶄綔鎸夐挳 -->
-          <el-table-column label="鎿嶄綔" fixed="right" min-width="360" align="center">
-            <template slot-scope="scope">
-              <el-button size="small" type="text" @click="viewIssued(scope.row)">鏌ョ湅鎶ュ憡</el-button>
-              <el-upload ref='upload1'
-                         style="display: inline"
-                         :action="fileAction1 +'?id='+ scope.row.id"
-                         :auto-upload="true"
-                         :before-upload="fileBeforeUpload1"
-                         :headers="headers" :on-error="onError1"
-                         :on-success="handleSuccessUp1"
-                         :show-file-list="false"
-                         accept='.doc,.docx'>
-                <el-button size="small" type="text" :disabled="scope.row.state != 0 || userName !== scope.row.writeUserName">涓婁紶</el-button>
-                <!--                <span>涓婁紶</span>-->
-              </el-upload>
-              <el-button type="text" size="small" :disabled="scope.row.state != 0 || userName !== scope.row.writeUserName" @click="handleRestore(scope.row)">杩樺師</el-button>
-              <el-button type="text" size="small" :disabled="scope.row.state != 0 || userName !== scope.row.writeUserName" @click="sendBackTask(scope.row)">閫�鍥炰换鍔�</el-button>
-              <el-button type="text" size="small" :disabled="scope.row.state != 0 || userName !== scope.row.writeUserName" @click="handle(scope.row)">鎻愪氦</el-button>
-              <el-button type="text" size="small" :disabled="scope.row.state == null || scope.row.state == 0 ||scope.row.isExamine == 1 || userName !== scope.row.examineUser" @click="handleIssued(scope.row)">瀹℃牳</el-button>
-              <el-button type="text" size="small" :disabled="scope.row.state == null || scope.row.state == 0 || scope.row.isExamine == 0 || scope.row.isExamine == null || scope.row.isRatify == 1 || userName !== scope.row.ratifyUser" @click="handleApprove(scope.row)">鎵瑰噯</el-button>
-              <el-popover placement="bottom" :width="170" trigger="hover">
-                <template #reference>
-                  <el-button link type="text" size="small">鏇村</el-button>
-                </template>
-                <div>
-                  <el-button style="margin-left: 10px" type="text" size="small" @click="download(scope.row)">涓嬭浇</el-button>
-                  <el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button>
-                  <el-button type="text" size="small" @click="handleFileLook(scope.row)">闄勪欢涓婁紶</el-button>
-                </div>
-              </el-popover>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.current"
-                       style="margin-right: 5%;" :page-sizes="[10, 20, 30, 50, 100]" :page-size="page.size"
-                       layout="->,total, sizes, prev, pager, next, jumper" :total="total">
-        </el-pagination>
-      </div>
+      </lims-table>
     </div>
     <el-dialog :fullscreen="fullscreen" :modal-append-to-body="false" :visible.sync="claimVisible" title="鍦ㄧ嚎缂栧埗"
                width="22cm">
@@ -229,17 +158,8 @@
         <el-button :loading="loadingVerify" type="primary" @click="handleSubmit">纭� 瀹�</el-button>
       </span>
     </el-dialog>
-    <div v-if="activeFace >0 && isCopper === null" style="width: 100%;height: 100%;">
-      <Add :active="activeFace" :currentId="currentId" :examine="examine"/>
-    </div>
-    <div v-if="activeFace >0 && isCopper === 0" style="width: 100%;height: 100%;">
-      <CustomsInspection :active="activeFace" :currentId="currentId" :customsInspection="customsInspection" :isReport="isReport"/>
-    </div>
-    <div v-if="activeFace >0 && isCopper === 1" style="width: 100%;height: 100%;">
-      <CopperOrder :active="activeFace" :currentId="currentId"></CopperOrder>
-    </div>
     <!--浜т笟閾句俊鎭煡鐪�-->
-    <ShowInfo v-if="showInfoDialog" ref="showInfoDialog" :showInfoDialog="showInfoDialog"></ShowInfo>
+<!--    <ShowInfo v-if="showInfoDialog" ref="showInfoDialog" :showInfoDialog="showInfoDialog"></ShowInfo>-->
     <!--鎶ュ憡鏌ョ湅-->
     <el-dialog :fullscreen="fullscreen" :modal-append-to-body="false" :visible.sync="viewIssuedVisible" title="鎶ュ憡鏌ョ湅"
                width="80vw">
@@ -251,33 +171,22 @@
         <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
       </div>
     </el-dialog>
-    <!--妫�楠屼换鍔′俊鎭煡鐪�-->
-    <Inspection v-if="state>0" :key="InspectionKey" :inspectorList="inspectorList" :orderId="orderId"
-                :sonLaboratory="sonLaboratory" :state="state"
-                :typeSource="typeSource"
-                @goback="goback" @refreshView="refreshView"/>
     <!--闄勪欢鏌ョ湅-->
     <el-dialog :visible.sync="filesDialogVisible" title="闄勪欢鏌ョ湅" width="80%" @closed="closeFilesLook">
-      <div style="display: flex;justify-content: space-between;">
+      <div style="margin-bottom: 10px">
         <el-upload ref='upload'
                    :action="fileAction"
                    :auto-upload="true"
                    :before-upload="fileBeforeUpload" :data="{orderId: filesLookInfo.insOrderId}"
-                   :headers="headers" :on-error="onError"
+                   :headers="uploadHeader" :on-error="onError"
                    :on-success="handleSuccessUp"
                    :show-file-list="false"
                    accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' style="width: 80px !important;">
           <el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button>
         </el-upload>
       </div>
-<!--      <div v-if="filesDialogVisible" style="height: 70vh;overflow-y: auto;">-->
-<!--        <ValueTable :key="upIndex"-->
-<!--                    ref="fileList"-->
-<!--                    :componentData="fileComponentData"-->
-<!--                    :delUrl="$api.insOrderPlan.delfile"-->
-<!--                    :url="$api.insOrderPlan.getFileList"-->
-<!--                    class="value-table"/>-->
-<!--      </div>-->
+      <lims-table :tableData="tableDataFile" :column="columnFile" @pagination="paginationFile" height="500px"
+                  key="tableDataFile" :page="pageFile" :tableLoading="tableLoadingFile"></lims-table>
     </el-dialog>
   </div>
 </template>
@@ -286,206 +195,33 @@
 import onlyoffice from "@/components/Onlyoffice/onlyoffice.vue";
 // import ShowInfo from "../do/b1-material-ins-order/showInfo.vue";
 import file from "@/utils/file";
+import {
+  downAll,
+  examineReport,
+  pageInsReport,
+  ratifyReport,
+  sendBackTask,
+  upReportUrl,
+  writeReport
+} from "@/api/business/insReport";
+import {mapGetters} from "vuex";
+import {selectUserCondition} from "@/api/business/inspectionTask";
+import limsTable from "@/components/Table/lims-table.vue";
+import {delfile, downFile, getFileList} from "@/api/business/rawMaterialOrder";
 export default {
-  components: {onlyoffice},
+  components: {limsTable, onlyoffice},
   data() {
     return {
-      componentData: {
-        entity: {
-          queryStatus: null,
-          code: null,
-          typeSource: null,
-          orderBy: {
-            field: 'id',
-            order: 'desc'
-          }
-        },
-        isIndex: true,
-        showSelect: true,
-        select: true,
-        selectMethod: 'handleChange',
-        do: [
-          {
-            id: '',
-            font: '鏌ョ湅鎶ュ憡',
-            type: 'text',
-            method: 'viewIssued',
-          },
-          {
-            id: 'download',
-            font: '涓嬭浇',
-            type: 'text',
-            method: 'download'
-          }, {
-            id: 'handleUpload',
-            font: '涓婁紶',
-            type: 'upload',
-            uploadConfig: {
-              url: this.$api.insReport.inReport,
-              accept: '.docx'
-            },
-            method: 'handleUpload',
-            disabFun: (row, index) => {
-              return row.state != 0 || userName != row.writeUserName
-            }
-          },
-          {
-            id: 'handleRestore',
-            font: '杩樺師',
-            type: 'text',
-            method: 'handleRestore',
-            disabFun: (row, index) => {
-              return row.state != 0 || JSON.parse(localStorage.getItem("user")).name != row.writeUserName
-            }
-          },
-          {
-            id: 'sendBackTask',
-            font: '閫�鍥炰换鍔�',
-            type: 'text',
-            method: 'sendBackTask',
-            disabFun: (row, index) => {
-              return row.state != 0 || JSON.parse(localStorage.getItem("user")).name != row.writeUserName
-            }
-          },
-          {
-            id: 'handle',
-            font: '鎻愪氦',
-            type: 'text',
-            method: 'handle',
-            disabFun: (row, index) => {
-              return row.state != 0 || JSON.parse(localStorage.getItem("user")).name != row.writeUserName
-            }
-          },
-          {
-            id: 'handleIssued',
-            font: '瀹℃牳',
-            type: 'text',
-            method: 'handleIssued',
-            disabFun: (row, index) => {
-              return row.state == null || row.state == 0 || row.isExamine == 1 || JSON.parse(localStorage.getItem("user")).name != row.examineUser
-            }
-          }, {
-            id: 'handleApprove',
-            font: '鎵瑰噯',
-            type: 'text',
-            method: 'handleApprove',
-            disabFun: (row, index) => {
-              return row.state == null || row.state == 0 || row.isExamine == 0 || row.isExamine == null || row.isRatify == 1 || JSON.parse(localStorage.getItem("user")).name != row.ratifyUser
-            }
-          },
-          {
-            id: '',
-            font: '鍘熷璁板綍',
-            type: 'text',
-            method: 'viewInspectInfo',
-          },
-          {
-            id: '',
-            font: '闄勪欢涓婁紶',
-            type: 'text',
-            method: 'handleFileLook',
-          }
-        ],
-        linkEvent: {
-          code: {
-            method: 'selectAllByOne'
-          }
-        },
-        tagField: {
-          isRatify: {
-            select: [{
-              value: 0,
-              type: 'danger',
-              label: '涓嶆壒鍑�'
-            }, {
-              value: 1,
-              type: 'success',
-              label: '鎵瑰噯'
-            }]
-          },
-          isExamine: {
-            select: [{
-              value: 0,
-              type: 'danger',
-              label: '涓嶉�氳繃'
-            }, {
-              value: 1,
-              type: 'success',
-              label: '閫氳繃'
-            }]
-          },
-          state: {
-            select: [{
-              value: 0,
-              type: 'danger',
-              label: '寰呮彁浜�'
-            }, {
-              value: 1,
-              type: 'success',
-              label: '宸叉彁浜�'
-            }]
-          },
-          typeSource: {
-            select: [{
-              value: 0,
-              label: '鎴愬搧涓嬪崟',
-              type: 'info'
-            },{
-              value: 1,
-              label: '鍘熸潗鏂欎笅鍗�',
-              type: 'info'
-            }]
-          },
-          queryStatus: {
-            select: [{
-              value: 0,
-              label: '寰呮彁浜�',
-              type: 'info'
-            },{
-              value: 1,
-              label: '寰呭鏍�',
-              type: 'info'
-            },{
-              value: 2,
-              label: '寰呮壒鍑�',
-              type: 'info'
-            }]
-          },
-          orderType: {
-            select: [{
-              value: 'Customer-ordered test',
-              label: '濮旀墭璇曢獙',
-              type: 'success',
-              effect: 'plain'
-            },{
-              value: '鎶芥',
-              label: '鎶芥',
-              type: '',
-              effect: 'plain'
-            },{
-              value: '杩涘巶妫�楠�',
-              label: '杩涘巶妫�楠�',
-              type: 'info',
-              effect: 'plain'
-            },{
-              value: 'Quarterly inspection',
-              label: '瀛ｅ害妫�楠�',
-              type: 'warning',
-              effect: 'plain'
-            }]
-          }
-        },
-        selectField: {},
-        requiredAdd: [],
-        needSort: ['createTime', 'state', 'writeTime', 'isExamine', 'examineTime', 'ratifyTime'],
-        requiredUp: []
+      entity: {
+        queryStatus: null,
+        code: null,
+        typeSource: null,
       },
       page: {
         current: 1,
         size: 20,
+        total: 0
       },
-      total: null,
-      entityCopy: {},
       upIndex: 0,
       statusList: [],
       claimVisible: false,
@@ -542,78 +278,214 @@
       sonLaboratory: '', // 璇曢獙瀹�
       filesDialogVisible: false,
       filesLookInfo: {},
-      fileComponentData: {
-        entity: {
-          insOrderId:''
-        },
-        isIndex: true,
-        showSelect: false,
-        select: false,
-        sort: false,
-        init:false,
-        do: [
-          {
-            id: 'parent',
-            font: '涓嬭浇',
-            type: 'text',
-            method: 'handleDown'
-          },{
-            id: 'delete',
-            font: '鍒犻櫎',
-            type: 'text',
-            method: 'doDiy',
+      tableDataFile: [],
+      tableLoadingFile: false,
+      columnFile: [
+        {
+          dataType: 'tag',
+          label: '绫诲瀷',
+          prop: 'type',
+          formatData: (params) => {
+            if (params == 1) {
+              return '鍥剧墖'
+            } else if (params == 2) {
+              return '鏂囦欢'
+            } else {
+              return ''
+            }
+          },
+          formatType: (params) => {
+            if (params == 1) {
+              return 'success'
+            } else if (params == 2) {
+              return 'warning'
+            } else {
+              return ''
+            }
           }
-        ],
-        isPage: false,
-        linkEvent: {},
-        tagField: {
-          type:{
-            select:[
-              {
-                value: 1,
-                label: '鍥剧墖'
-              },
-              {
-                value: 2,
-                label: '鏂囦欢'
+        },
+        { label: '闄勪欢鍚嶇О', prop: 'fileName' },
+        { label: '涓婁紶浜�', prop: 'name' },
+        { label: '涓婁紶鏃堕棿', prop: 'createTime' },
+        {
+          dataType: 'action',
+          fixed: 'right',
+          label: '鎿嶄綔',
+          width: '170px',
+          operation: [
+            {
+              name: '涓嬭浇',
+              type: 'text',
+              clickFun: (row) => {
+                this.handleDown(row);
               }
-            ]
-          }
-        },
-        currentId: '',
-        selectField: {},
-        requiredAdd: [],
-        requiredUp: []
+            },
+            {
+              name: '鍒犻櫎',
+              type: 'text',
+              clickFun: (row) => {
+                this.delete(row);
+              }
+            },
+          ]
+        }
+      ],
+      pageFile: {
+        total: 0,
+        size: 10,
+        current: 1
       },
       isCopper: null,
       tableLoading: false,
       valueTableData: [],
-      userName: ''
+      column: [
+        {
+          label: "鎶ュ憡缂栧彿",
+          prop: "code",
+          width: "160px",
+          dataType: "link",
+          linkMethod: "selectAllByOne",
+        },
+        {
+          label: "涓嬪崟绫诲埆",
+          prop: "typeSource",
+          width: "100px",
+          dataType: "tag",
+          formatData: (params) => {
+            if (params == 0) {
+              return "鎴愬搧涓嬪崟";
+            } else {
+              return "鍘熸潗鏂欎笅鍗�";
+            }
+          },
+        },
+        {
+          label: "妫�楠岀被鍨�",
+          prop: "orderType",
+          width: "100px",
+          dataType: "tag",
+          formatData: (params) => {
+            return this.orderTypeList.find((m) => m.value == params).label;
+          },
+          formatType: (params) => {
+            return this.orderTypeList.find((m) => m.value == params).type;
+          },
+        },
+        { label: "鍒涘缓鏃堕棿", prop: "createTime" },
+        { label: "鎻愪氦浜�", prop: "writeUserName" },
+        { label: "鎻愪氦鏃堕棿", prop: "writeTime" },
+        {
+          label: "鎻愪氦鐘舵��",
+          prop: "state",
+          width: "100px",
+          dataType: "tag",
+          formatData: (params) => {
+            if (params == 0) {
+              return "寰呮彁浜�";
+            } else {
+              return "宸叉彁浜�";
+            }
+          },
+          formatType: (params) => {
+            if (params == 0) {
+              return "danger";
+            } else {
+              return "success";
+            }
+          },
+        },
+        { label: "瀹℃牳浜�", prop: "examineUser" },
+        { label: "瀹℃牳鏃堕棿", prop: "examineTime" },
+        {
+          label: "瀹℃牳鐘舵��",
+          prop: "isExamine",
+          width: "100px",
+          dataType: "tag",
+          formatData: (params) => {
+            if (params == 0) {
+              return "涓嶉�氳繃";
+            } else {
+              return "閫氳繃";
+            }
+          },
+          formatType: (params) => {
+            if (params == 0) {
+              return "danger";
+            } else {
+              return "success";
+            }
+          },
+        },
+        { label: "瀹℃牳澶囨敞", prop: "examineTell" },
+        { label: "鎵瑰噯浜�", prop: "ratifyUser" },
+        { label: "鎵瑰噯鏃堕棿", prop: "ratifyTime" },
+        {
+          label: "鎵瑰噯鐘舵��",
+          prop: "isRatify",
+          width: "100px",
+          dataType: "tag",
+          formatData: (params) => {
+            if (params == 0) {
+              return "涓嶆壒鍑�";
+            } else {
+              return "鎵瑰噯";
+            }
+          },
+          formatType: (params) => {
+            if (params == 0) {
+              return "danger";
+            } else {
+              return "success";
+            }
+          },
+        },
+        { label: "鎵瑰噯澶囨敞", prop: "ratifyTell" },
+        {
+          fixed: "right",
+          dataType: "slot",
+          slot: "action",
+          width: '360px',
+          label: "鎿嶄綔"
+        }
+      ],
+      userName: '',
     }
   },
   computed: {
-    headers() {
-      return {
-        'token': sessionStorage.getItem('token')
-      }
-    },
+    ...mapGetters(["nickName", "userId"]),
     action() {
-      return this.javaApi + this.$api.insReport.upAll
+      return this.javaApi + '/insReport/upAll'
     },
     fileAction() {
-      return this.javaApi + this.$api.insOrderPlan.uploadFile
+      return this.javaApi + '/unqualifiedHandler/uploadFileByUnqualified'
     },
     fileAction1() {
-      return this.javaApi + this.$api.insReport.inReport
+      return this.javaApi + '/insReport/inReport'
     }
   },
   mounted() {
-    this.entityCopy = this.HaveJson(this.componentData.entity)
-    this.userName = JSON.parse(localStorage.getItem("user")).name
-    this.getPower()
     this.refreshTable()
   },
   methods: {
+    refreshTable() {
+      this.tableLoading = true
+      pageInsReport({
+        ...this.page,...this.entity
+      }).then(res => {
+        this.tableLoading = false
+        this.page.total = res.data.body.total
+        this.valueTableData = res.data.body.records
+      })
+    },
+    pagination({ page, limit }) {
+      this.page.current = page;
+      this.page.size = limit;
+      this.refreshTable();
+    },
+    refresh() {
+      this.resetForm('entity')
+      this.refreshTable();
+    },
     handleChange(arr){
       this.mutiList = arr
     },
@@ -624,27 +496,40 @@
       if(row.userName){
         inspectorList = row.userName.split(',')
       }
-      let user = JSON.parse(localStorage.getItem('user'))
-      if(user){
-        inspectorList.push(user.name)
-      }
-      this.inspectorList = inspectorList
-      this.state = 3;
-      this.typeSource = row.typeSource
-      this.orderId = row.insOrderId
-      this.sonLaboratory = row.sonLaboratory
+      inspectorList.push(this.nickName)
+      this.$router.push({
+        path: "/inspectionTask/inspection",
+        query: {
+          sonLaboratory: row.sonLaboratory,
+          state: 3,
+          typeSource: row.typeSource,
+          orderId: row.insOrderId,
+          inspectorList: inspectorList,
+        },
+      })
     },
-    goback() {
-      this.state = 0
-      this.refreshTable('page')
-    },
+    // 鎵撳紑鏌ョ湅闄勪欢寮规
     handleFileLook (row) {
       this.filesLookInfo = row
       this.filesDialogVisible = true
-      this.fileComponentData.entity.insOrderId = row.insOrderId
-      this.$nextTick(() => {
-        this.$refs['fileList'].selectList()
+      this.getFileList()
+    },
+    // 鏌ヨ闄勪欢鏌ョ湅鍒楄〃鍥炶皟
+    getFileList() {
+      this.tableLoadingFile = true
+      getFileList({insOrderId: this.filesLookInfo.insOrderId}).then(res => {
+        this.tableLoadingFile = false
+        if (res.code === 200) {
+          this.tableDataFile = res.data.records
+          this.pageFile.total = res.data.total
+        }
+      }).catch(err => {
+        this.tableLoadingFile = false
       })
+    },
+    paginationFile(page) {
+      this.pageFile.size = page.limit
+      this.getFileList()
     },
     closeFilesLook () {
       this.filesDialogVisible = false
@@ -653,7 +538,7 @@
       this.upLoading = false;
       if (response.code == 200) {
         this.$message.success('涓婁紶鎴愬姛');
-        this.$refs.fileList.selectList()
+        this.getFileList()
       }
     },
     handleSuccessUp1(response, ) {
@@ -661,8 +546,9 @@
         this.$message.success('涓婁紶鎴愬姛');
       }
     },
+    // 涓嬭浇闄勪欢鐨勬枃浠�
     handleDown(row){
-      this.$axios.post(this.$api.insOrderPlan.downFile, {
+      downFile({
         id: row.id,
       }).then(res => {
         if (res.code === 200) {
@@ -682,9 +568,23 @@
 
       })
     },
-    // 鍒锋柊椤甸潰
-    refreshView () {
-      this.InspectionKey++
+    // 鍒犻櫎闄勪欢鏂囦欢
+    delete(row) {
+      this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning"
+      }).then(() => {
+        delfile({ id: row.id }).then(res => {
+          if (res.code === 500) {
+            return
+          }
+          this.$message.success('鍒犻櫎鎴愬姛')
+          this.getList()
+        }).catch(e => {
+          this.$message.error('鍒犻櫎澶辫触')
+        })
+      }).catch(() => { })
     },
     // 鏌ョ湅浜т笟閾句俊鎭�
     openInfoDialog (row) {
@@ -700,7 +600,7 @@
       }
       let str = this.mutiList.map(m=>m.id).join(',')
       this.outLoading = true
-      this.$axios.get(this.$api.insReport.downAll+'?ids='+str).then(res => {
+      downAll({ids: str}).then(res => {
         this.outLoading = false
         this.$message.success('瀵煎嚭鎴愬姛')
         // const blob = new Blob([res],{ type: 'application/octet-stream' });
@@ -765,118 +665,48 @@
       this.$message.error('涓婁紶澶辫触')
       this.$refs.upload1.clearFiles()
     },
-    refreshTable(e) {
-      this.tableLoading = false
-      this.$axios.post(this.$api.insReport.pageInsReport, {
-        page: this.page,
-        entity: this.componentData.entity
-      }, {
-        headers: {
-          'Content-Type': 'application/json'
-        }
-      }).then(res => {
-        this.tableLoading = false
-        if (res.code === 201) {
-          return
-        }
-        this.total = res.data.body.total
-        this.valueTableData = res.data.body.records
-      })
-    },
-    handleSizeChange(val) {
-      this.page.size = val
-      this.refreshTable();
-    },
-    handleCurrentChange(val) {
-      this.page.current = val
-      this.refreshTable();
-    },
-    refresh() {
-      this.componentData.entity = this.HaveJson(this.entityCopy)
-      this.refreshTable();
-    },
-    async handleWeave(row) {
-      let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
-      fileName = fileName.replace('/word/','')
-      const userName = JSON.parse(localStorage.getItem("user")).name;
-      //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
-      const { href } = this.$router.resolve({
-        path: `/wordEdit`,
-        query: {
-          url: this.javaApi + "/word/" + fileName,
-          isEdit: true,
-          fileType: "docx",
-          title: fileName,
-          lang: 'zh-CN',
-          isPrint: true,
-          user_id: 1,
-          user_name: userName,
-          editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + fileName
-        }
-      })
-      window.open(href, '_blank');
-    },
-    // 鏉冮檺鍒嗛厤
-    getPower(radio) {
-      let power = JSON.parse(sessionStorage.getItem('power'))
-      let edit = false
-      let up = false
-      let res = false
-      let sub = false
-      let issued = true
-      let approve = true
-      for (var i = 0; i < power.length; i++) {
-        if (power[i].menuMethod == 'upReportFile') {
-          edit = true
-        }
-        if (power[i].menuMethod == 'inReport') {
-          up = true
-        }
-        if (power[i].menuMethod == 'upReportUrl') {
-          res = true
-        }
-        if (power[i].menuMethod == 'writeReport') {
-          sub = true
-        }
-        if (power[i].menuMethod == 'ratifyReport') {
-          approve = true
-        }
-        if (power[i].menuMethod == 'examineReport') {
-          issued = true
-        }
-      }
-      if (!approve) {
-        this.componentData.do.splice(6, 1)
-      }
-      if (!issued) {
-        this.componentData.do.splice(5, 1)
-      }
-      if (!sub) {
-        this.componentData.do.splice(4, 1)
-      }
-      if (!res) {
-        this.componentData.do.splice(3, 1)
-      }
-      if (!up) {
-        this.componentData.do.splice(2, 1)
-      }
-      if (!edit) {
-        this.componentData.do.splice(0, 1)
-      }
-    },
     confirmClaim() {
       // console.log(this.$refs.Word.getValue())
     },
-    playOrder(num) {
-      this.activeFace = num
-    },
-    async selectAllByOne(row) {
+    selectAllByOne(row) {
       this.isCopper = row.isCopper
       this.customsInspection = row
       this.activeFace = 2;
       this.examine = 1;
       this.isReport = 1
       this.currentId = parseInt(row.insOrderId)
+      switch (row.isCopper) {
+        case 0:
+          // 鍘熸潗鏂�
+          this.$router.push({
+            path: "/materialOrder/customsInspection", query: {
+              customsInspection: row,
+              active: this.activeFace,
+              currentId: row.insOrderId,
+              isReport: this.isReport
+            }
+          });
+          break;
+        case null:
+          // 鎴愬搧
+          this.$router.push({
+            path: "/productOrder/add", query: {
+              examine: this.examine,
+              active: this.activeFace,
+              currentId: row.insOrderId
+            }
+          });
+          break;
+        case 1:
+          // 閾滄潗
+          this.$router.push({
+            path: "/materialOrder/copperOrder", query: {
+              active: this.activeFace,
+              currentId: row.insOrderId
+            }
+          });
+          break;
+      }
     },
     download(row) {
       let url = row.urlS ? row.urlS : row.url;
@@ -888,7 +718,7 @@
     },
     // 杩樺師鎿嶄綔
     handleRestore(row) {
-      this.$axios.post(this.$api.insReport.upReportUrl, {
+      upReportUrl({
         id: row.id
       }).then(res => {
         if (res.code === 200) {
@@ -907,7 +737,7 @@
         fileType = "pdf"
       }
       fileName = fileName.replace('/word/','')
-      const userName = JSON.parse(localStorage.getItem("user")).name;
+      const userName = this.nickName
       this.option = {
         url: this.javaApi + "/word/" + fileName,
         isEdit: false,
@@ -921,19 +751,6 @@
       }
       this.issuedVisible = true;
     },
-    // 鏌ョ湅pdf鎶ュ憡
-    viewIssuedPdf(row) {
-      this.currentInfo = row;
-      let url = row.tempUrlPdf
-      if(url){
-        url = url.split('.')[0]+'.pdf'
-        const link = document.createElement('a');
-        link.href = this.javaApi + url;
-        link.target = '_blank';
-        document.body.appendChild(link);
-        link.click();
-      }
-    },
     // 鏌ョ湅鎶ュ憡
     viewIssued(row) {
       this.currentInfo = row;
@@ -944,7 +761,7 @@
         fileType = "pdf"
       }
       fileName = fileName.replace('/word/','')
-      const userName = JSON.parse(localStorage.getItem("user")).name;
+      const userName = this.nickName
       this.option = {
         url: this.javaApi + "/word/" + fileName,
         isEdit: false,
@@ -966,11 +783,8 @@
         type: 'warning'
       }).then(() => {
         this.upLoad = true
-        this.$axios.post(this.$api.insReport.sendBackTask+'?id='+row.id).then(res => {
+        sendBackTask({id: row.id}).then(res => {
           this.upLoad = false
-          if (res.code === 201) {
-            return
-          }
           this.$message.success('閫�鍥炴垚鍔燂紒')
           this.refreshTable('page')
         }).catch(err => {
@@ -990,15 +804,12 @@
         return
       }
       this.loadingIssued = true;
-      this.$axios.post(this.$api.insReport.examineReport, {
+      examineReport({
         id: this.currentInfo.id,
         userId: this.approver,
         isExamine: 1
       }).then(res => {
         this.loadingIssued = false;
-        if (res.code === 201) {
-          return
-        }
         this.$message.success('鎻愪氦鎴愬姛')
         this.refreshTable('page')
         this.currentInfo = null;
@@ -1020,18 +831,15 @@
     },
     // 鑾峰彇浜哄憳鍒楄〃
     getAuthorizedPerson() {
-      this.$axios.get(this.$api.user.selectQualityUserList).then(res => {
-        let data = []
-        let userName = JSON.parse(localStorage.getItem("user")).name;
-        res.data.forEach(a => {
-          // if(a.name !== userName) {
+      selectUserCondition({ type: 0 }).then((res) => {
+        let data = [];
+        res.data.forEach((a) => {
           data.push({
             label: a.name,
-            value: a.id
-          })
-          // }
-        })
-        this.approverList = data
+            value: a.id,
+          });
+        });
+        this.approverList = data;
       })
     },
     // 鎵瑰噯鎸夐挳
@@ -1044,7 +852,7 @@
         fileType = "pdf"
       }
       fileName = fileName.replace('/word/','')
-      const userName = JSON.parse(localStorage.getItem("user")).name;
+      const userName = this.nickName
       this.option = {
         url: this.javaApi + "/word/" + fileName,
         isEdit: false,
@@ -1061,15 +869,11 @@
     // 鎵瑰噯閫氳繃
     subApprove() {
       this.loadingApprove = true;
-      this.$axios.post(this.$api.insReport.ratifyReport, {
+      ratifyReport({
         id: this.currentInfo.id,
         isRatify: 1
       }).then(res => {
         this.loadingApprove = false;
-        if (res.code == 201) {
-          this.$message.error('鎵瑰噯澶辫触')
-          return
-        }
         this.$message.success('宸叉壒鍑�')
         this.refreshTable('page')
         this.currentInfo = null;
@@ -1084,14 +888,11 @@
     // 鎻愪氦瀹℃牳浜烘搷浣�
     handleSubmit(row) {
       this.loadingVerify = true
-      this.$axios.post(this.$api.insReport.writeReport, {
+      writeReport({
         id: this.currentInfo.id,
         userId: this.verifyUser,
       }).then(res => {
         this.loadingVerify = false
-        if (res.code === 201) {
-          return
-        }
         this.addVerifyDia = false
         this.$message.success('鎻愪氦鎴愬姛')
         this.refreshTable('page')
@@ -1110,15 +911,12 @@
         return this.$message.error('璇疯緭鍏ュ師鍥�')
       }
       this.loadingIssuedReason = true;
-      this.$axios.post(this.$api.insReport.examineReport, {
+      examineReport({
         id: this.currentInfo.id,
         isExamine: 0,
         examineTell: this.reason
       }).then(res => {
         this.loadingIssuedReason = false;
-        if (res.code === 201) {
-          return
-        }
         this.$message.success('鎿嶄綔鎴愬姛')
         this.refreshTable('page')
         this.currentInfo = null;
@@ -1136,15 +934,12 @@
         return this.$message.error('璇疯緭鍏ュ師鍥�')
       }
       this.loadingApproveReason = true
-      this.$axios.post(this.$api.insReport.ratifyReport, {
+      ratifyReport({
         id: this.currentInfo.id,
         isRatify: 0,
         examineTell: this.reason
       }).then(res => {
         this.loadingApproveReason = false
-        if (res.code === 201) {
-          return
-        }
         this.$message.success('鎿嶄綔鎴愬姛')
         this.refreshTable('page')
         this.currentInfo = null;
diff --git a/src/views/business/sample/components/detail.vue b/src/views/business/sample/components/detail.vue
new file mode 100644
index 0000000..f76f413
--- /dev/null
+++ b/src/views/business/sample/components/detail.vue
@@ -0,0 +1,197 @@
+<template>
+  <div style="width: 100%;height: 100%;overflow-y: auto;" class="detail">
+    <div>
+      <el-row class="title">
+        <el-col :span="12" style="padding-left: 20px;text-align: left;">鏍峰搧璇︽儏</el-col>
+        <el-col :span="12" style="text-align: right;">
+          <el-button size="small" @click="hanldeBack">杩斿洖</el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="search">
+      <div class="search_thing">
+        <div class="search_label">鏍峰搧缂栧彿锛�</div>
+        <div class="search_input">
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable
+							v-model="entity.sampleCode" disabled></el-input>
+        </div>
+      </div>
+      <div class="search_thing">
+        <div class="search_label">鏍峰搧鍚嶇О锛�</div>
+        <div class="search_input">
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable
+							v-model="entity.sample" disabled></el-input>
+        </div>
+      </div>
+      <div class="search_thing">
+        <div class="search_label">鏍峰搧鏁伴噺锛�</div>
+        <div class="search_input">
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable
+							v-model="entity.num" disabled></el-input>
+        </div>
+      </div>
+      <div class="search_thing">
+        <div class="search_label">鍗曚綅锛�</div>
+        <div class="search_input">
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable
+							v-model="entity.unit" disabled></el-input>
+        </div>
+      </div>
+      <div class="search_thing">
+        <div class="search_label">鍏ュ簱鏃堕棿锛�</div>
+        <div class="search_input">
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable
+							v-model="entity.date" disabled></el-input>
+        </div>
+      </div>
+      <div class="search_thing">
+        <div class="search_label">鍏ュ簱浜猴細</div>
+        <div class="search_input">
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable
+							v-model="entity.user" disabled></el-input>
+        </div>
+      </div>
+      <div class="search_thing" >
+        <div class="search_label">搴撲綅鍙凤細</div>
+        <div class="search_input">
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable
+							v-model="entity.code" disabled style="min-width: 230px;"></el-input>
+        </div>
+      </div>
+    </div>
+    <h4>妫�楠岄」鐩�</h4>
+    <div class="table">
+      <el-table class="el-table" ref="productTable" :data="products" height="380px" tooltip-effect="dark" border>
+				<el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
+				</el-table-column>
+				<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="100"
+					show-overflow-tooltip></el-table-column>
+				<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip v-if="PROJECT=='瑁呭鐢电紗'"></el-table-column>
+				<el-table-column prop="laboratory" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{handleData(scope.row.equipValue)}}
+          </template>
+        </el-table-column>
+				<el-table-column prop="entrustCode" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="updateUserName" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="updateTime" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="insResult" label="缁撹" min-width="100">
+					<template slot-scope="scope">
+            <el-tag
+              :type="scope.row.insResult==1?'success':'danger'" size="medium">{{scope.row.insResult==1?'鍚堟牸':'涓嶅悎鏍�'}}</el-tag>
+					</template>
+				</el-table-column>
+			</el-table>
+    </div>
+    <h4>鍑哄叆搴撳巻鍙�</h4>
+    <div class="table" style="margin-bottom: 20px;">
+      <el-table class="el-table" ref="productTable" :data="histories" height="380px" tooltip-effect="dark" border>
+				<el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
+				</el-table-column>
+				<el-table-column prop="state" label="绫诲瀷"
+					show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.state==1?'success':'danger'">{{ scope.row.state==1?'鍏ュ簱':'鍑哄簱' }}</el-tag>
+          </template>
+        </el-table-column>
+				<el-table-column prop="createUserName" label="鎿嶄綔浜�"  show-overflow-tooltip></el-table-column>
+				<el-table-column prop="createTime" label="鎿嶄綔鏃堕棿"  show-overflow-tooltip></el-table-column>
+				<el-table-column prop="warehouseCode" label="搴撲綅鍙�" show-overflow-tooltip></el-table-column>
+				<!-- <el-table-column prop="price" label="瀛樻斁鍛ㄦ湡锛坔锛�" show-overflow-tooltip></el-table-column> -->
+			</el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['id'],
+  data(vm) {
+      return{
+        entity:{
+          num:1,
+        },
+        products:[],
+        histories:[]
+      }
+  },
+  mounted(){
+    this.getInfo()
+  },
+  methods:{
+    hanldeBack(){
+      this.$emit('hanldeBack')
+    },
+    getInfo(){
+      this.$axios.post(this.$api.warehouse.getSampleRecord, {
+        id: this.id
+      }).then(res => {
+        let {histories,insSample,sampleHistory,products} = res.data;
+        this.entity = {num:1,...insSample,...sampleHistory};
+        this.histories = histories;
+        this.products = products;
+      })
+    },
+    handleData(e){
+      let info = ''
+      if(e){
+        info = JSON.parse(e).map(item => {
+        return item.v;
+      }).join(',')
+      }
+      return info
+    }
+  }
+}
+</script>
+
+<style scoped>
+	.detail::-webkit-scrollbar{
+		width: 0;
+	}
+
+	.title {
+		height: 60px;
+		line-height: 60px;
+	}
+
+	.search {
+		background-color: #fff;
+		height: 120px;
+		display: flex;
+		align-items: center;
+    flex-wrap: wrap;
+	}
+
+	.search_thing {
+		display: flex;
+		align-items: center;
+		height: 40px;
+	}
+
+	.search_label {
+		width: 120px;
+		font-size: 14px;
+		text-align: right;
+	}
+
+	.search_input {
+		width: calc(100% - 120px);
+	}
+
+	.table {
+		margin-top: 10px;
+		background-color: #fff;
+		width: calc(100% - 40px);
+		padding: 20px;
+	}
+  h4{
+    font-size: 16px;
+    font-weight: normal;
+    margin-top: 10px;
+    margin-left: 20px;
+  }
+
+</style>
diff --git a/src/views/business/sample/index.vue b/src/views/business/sample/index.vue
new file mode 100644
index 0000000..886ecb4
--- /dev/null
+++ b/src/views/business/sample/index.vue
@@ -0,0 +1,704 @@
+<template>
+  <div class="capacity-scope">
+    <div v-if="!isDetail">
+      <div style="display: flex;justify-content: space-between">
+        <el-form :model="entity" ref="entity" size="small" :inline="true">
+          <el-form-item label="浠撳簱鍚嶇О" prop="warehouseId">
+            <el-select v-model="entity.warehouseId" placeholder="閫夋嫨浠撳簱" size="small" @change="warehouseChange">
+              <el-option v-for="item in warehouse" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="璐ф灦" prop="shelfId">
+            <el-select v-model="entity.shelfId" placeholder="閫夋嫨璐ф灦" size="small" @change="handleShelf">
+              <el-option v-for="item in shelf" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="鏍峰搧缂栧彿" prop="searchSampleCode">
+            <el-input placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" v-model="searchSampleCode" size="small">
+              <el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="small" style="color:#3A7BFA" @click="keepVisible=true">缁存姢</el-button>
+            <el-button size="small" style="color:#3A7BFA" @click="warehouseVisible=true,isEdit=false">娣诲姞浠撳簱</el-button>
+            <el-button size="small" style="color:#3A7BFA" @click="shelvesVisible=true,isEdit=false"
+                       :disabled="entity.warehouseId==null">娣诲姞璐ф灦</el-button>
+          </el-form-item>
+        </el-form>
+        <div>
+          <el-button size="small" type="primary" @click="storageVisible=true">鍏ュ簱</el-button>
+          <el-button size="small" type="primary" @click="exportVisible=true">鍑哄簱</el-button>
+        </div>
+      </div>
+      <div class="table" v-loading="tableLoading">
+        <table border="1" class="tables" cellpadding="10" style="table-layout:fixed;" v-if="tableList.length>0">
+          <tbody>
+          <tr v-for="(item,index) in tableList" :key="index">
+            <td v-for="(m,i) in item" :key="i" class="content">
+              <h4 v-if="m.row!=undefined">{{ m.row }} - {{ m.col }}</h4>
+              <ul>
+                <el-tooltip
+                  effect="dark"
+                  placement="top"
+                  v-for="(n,j) in m.samples"
+                  :key="j" :disabled="`${n.sample}${n.model}`.length<10">
+                  <div slot="content"><span>{{ n.sample }}</span>
+                    <span>&nbsp;({{ n.model }})&nbsp;[{{ n.sampleCode }}]</span></div>
+                  <li class="green"
+                      @click="handelDetail(n)">
+                    <i></i>
+                    <span>{{ n.sample }}</span>
+                    <span>&nbsp;({{ n.model }})&nbsp;[{{ n.sampleCode }}]</span>
+                    <!-- <span class="num">&nbsp;x{{ n.num }}</span> -->
+                  </li>
+                </el-tooltip>
+              </ul>
+            </td>
+          </tr>
+          <tr>
+            <td v-for="(item,index) in rowList" :key="index" style="background: ghostwhite;height: 20px;">{{ item }}
+            </td>
+          </tr>
+          </tbody>
+        </table>
+        <span v-else style="color: rgb(144, 147, 153);display: inline-block;position: absolute;top: 60%;left: 50%;transform: translate(-50%,-50%);">鏆傛棤鏁版嵁</span>
+      </div>
+    </div>
+    <Detail v-else @hanldeBack="isDetail=false" :id="currentId" />
+    <el-dialog title="鏍峰搧鍏ュ簱" :visible.sync="storageVisible" width="350px">
+      <el-row>
+        <el-col class="search_thing" :span="24">
+          <div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
+          <div class="search_input">
+            <el-input v-model="sampleCode" size="small"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <el-tree :data="storageList" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
+               :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
+               @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="storageVisible"
+               empty-text="鏆傛棤鏁版嵁">
+        <div class="custom-tree-node" slot-scope="{ node, data }">
+          <el-row>
+            <el-col :span="24">
+              <span><i
+                :class="`node_i ${data.warehouseShelfList != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
+                {{ data.name }}</span>
+            </el-col>
+          </el-row>
+        </div>
+      </el-tree>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="storageVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="confirmStorage" :loading="upLoadStorage">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="鏍峰搧鍑哄簱" :visible.sync="exportVisible" width="350px">
+      <!-- <div class="shaoma">
+        <img src="../../../static/img/鎵爜.svg" alt="" style="margin-right: 5px;">
+        <span>鎵爜鍑哄簱</span>
+      </div> -->
+      <el-row>
+        <el-col class="search_thing" :span="24">
+          <div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
+          <div class="search_input">
+            <el-input v-model="sampleCode" size="small"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="exportVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="confirmExport" :loading="upLoadExport">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="搴撲綅缁存姢" :visible.sync="keepVisible" width="350px" :append-to-body="true">
+      <el-tree :data="warehouse" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
+               :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
+               @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="keepVisible"
+               empty-text="鏆傛棤鏁版嵁">
+        <div class="custom-tree-node" style="width: 100%;" slot-scope="{ node, data }">
+          <el-row style="width: 100%;display: flex;align-items: center;">
+            <el-col :span="20">
+              <span><i
+                :class="`node_i ${node.level<2 ? 'el-icon-folder-opened': 'el-icon-tickets'}`"></i>
+                {{ data.name }}</span>
+            </el-col>
+            <el-col :span="4" v-if="node.level<3">
+              <el-button type="text" size="mini" icon="el-icon-edit" @click.stop="handleEdit(data,node.level)">
+              </el-button>
+              <el-button type="text" size="mini" icon="el-icon-delete" @click.stop="handleDelete(data,node.level)">
+              </el-button>
+            </el-col>
+          </el-row>
+        </div>
+      </el-tree>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="keepVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="keepVisible = false" >纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog :title="isEdit?'浠撳簱淇敼':'浠撳簱鏂板'" :visible.sync="warehouseVisible" width="350px">
+      <el-row>
+        <el-col class="search_thing" :span="24">
+          <div class="search_label"><span class="required-span">* </span>浠撳簱鍚嶇О锛�</div>
+          <div class="search_input">
+            <el-input v-model="name" size="small" @keyup.enter.native="confirmWarehouse"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="warehouseVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="confirmWarehouse" :loading="upLoadWarehouse">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog :title="isEdit?'璐ф灦淇敼':'璐ф灦鏂板'" :visible.sync="shelvesVisible" width="350px">
+      <el-row>
+        <el-col class="search_thing" :span="24">
+          <div class="search_label"><span class="required-span">* </span>璐ф灦鍚嶇О锛�</div>
+          <div class="search_input">
+            <el-input v-model="shelves.name" size="small"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col class="search_thing" :span="24">
+          <div class="search_label"><span class="required-span">* </span>璐ф灦灞傛暟锛�</div>
+          <div class="search_input">
+            <el-input v-model="shelves.row" size="small"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col class="search_thing" :span="24">
+          <div class="search_label"><span class="required-span">* </span>璐ф灦鍒楁暟锛�</div>
+          <div class="search_input">
+            <el-input v-model="shelves.col" size="small"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="shelvesVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="confirmShelves" :loading="upLoadShelves">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Detail from './components/detail.vue'
+import {
+  addShelf,
+  addWarehouse, delShelf, delWarehouse, getWarehouse,
+  inWarehouse,
+  outWarehouse, searchSampleId,
+  selectWarehouse,
+  upShelf,
+  upWarehouse
+} from "@/api/business/sample";
+export default {
+  components: {
+    Detail
+  },
+  data() {
+    return {
+      entity: {
+        warehouseId: null,
+        shelfId: null
+      },
+      warehouse: [],
+      shelf: [],
+      storageList:[],
+      storageVisible: false,
+      exportVisible: false,
+      keepVisible: false,
+      warehouseVisible: false,
+      shelvesVisible: false,
+      upLoadStorage: false,
+      upLoadExport: false,
+      upLoadWarehouse: false,
+      upLoadShelves: false,
+      tableList: [],
+      rowList: [],
+      value: '',
+      name:'',
+      shelves:{},
+      selectTree: [],
+      expandedKeys: [],
+      isEdit: false, //寮规--鏄惁鏄慨鏀�,榛樿涓篺alse
+      isDetail: false, //璇︽儏--鏄惁灞曠ず涓鸿鎯呴〉闈紝榛樿涓篺alse
+      currentEdit:null,//褰撳墠瑕佺淮鎶ょ殑淇℃伅
+      tableLoading:false,
+      sampleCode:'',
+      currentId:null,
+      searchSampleCode:''
+    }
+  },
+  mounted() {
+    this.selectList()
+  },
+  methods: {
+    selectList() {
+      selectWarehouse().then(res => {
+        this.warehouse = res.data
+        if(res.data.length==0){
+          this.entity.warehouseId = '';
+          this.entity.shelfId = '';
+          this.tableList = []
+        }
+        this.storageList = this.HaveJson(res.data).map(item=>{
+          item.warehouseShelfList&&item.warehouseShelfList.length>0&&item.warehouseShelfList.map(m=>{
+            let warehouseShelfList = [];
+            for (let i=1;i<m.row+1;i++){
+              let warehouseShelfList0 = []
+              for (let j=1;j<m.col+1;j++){
+                warehouseShelfList0.push({
+                  name:j+' 鍒�',
+                  id:j,
+                })
+              }
+              warehouseShelfList.push({
+                name:i+' 灞�',
+                id:i,
+                warehouseShelfList:warehouseShelfList0
+              })
+            }
+            m.warehouseShelfList = warehouseShelfList;
+            return m;
+          })
+          return item;
+        })
+        if(!this.entity.warehouseId&&this.warehouse.length>0){
+          this.entity.warehouseId = this.warehouse[0].id
+          this.warehouseChange(this.entity.warehouseId)
+          if(this.shelf.length>0){
+            this.entity.shelfId = this.shelf[0].id
+            this.handleShelf(this.entity.shelfId)
+          }else{
+            this.tableList = []
+          }
+        }else if(this.warehouse.length>0){
+          this.warehouseChange(this.entity.warehouseId)
+          if(this.shelf.length>0){
+            this.entity.shelfId = this.shelf[0].id
+            this.handleShelf(this.entity.shelfId)
+          }else{
+            this.tableList = []
+          }
+        }
+      })
+    },
+    // 鍏ュ簱
+    confirmStorage() {
+      if (!this.sampleCode) {
+        this.$message.error('璇峰～鍐欐牱鍝佺紪鍙�')
+        return
+      }
+      if (this.selectTree.length < 4) {
+        this.$message.error('璇烽�夋嫨鏍峰搧鍏ュ簱浣嶇疆')
+        return
+      }
+      this.upLoadStorage = true;
+      inWarehouse({
+        trees: this.selectTree.join('-'),
+        sampleCode:this.sampleCode
+      }).then(res => {
+        this.upLoadStorage = false;
+        this.storageVisible = false
+        this.sampleCode = '';
+        this.selectTree = []
+        this.$message.success('鍏ュ簱鎴愬姛')
+        this.handleShelf(this.entity.shelfId)
+      }).catch(err => {
+        this.upLoadStorage = false;
+      })
+    },
+    // 鍑哄簱
+    confirmExport() {
+      if (!this.sampleCode) {
+        this.$message.error('璇峰～鍐欐牱鍝佺紪鍙�')
+        return
+      }
+      this.upLoadExport = true;
+      outWarehouse({
+        sampleCode:this.sampleCode
+      }).then(res => {
+        this.upLoadExport = false;
+        this.exportVisible = false
+        this.sampleCode = '';
+        this.$message.success('鍑哄簱鎴愬姛')
+        this.handleShelf(this.entity.shelfId)
+      }).catch(err => {
+        this.upLoadExport = false;
+      })
+    },
+    // 娣诲姞/淇敼浠撳簱
+    confirmWarehouse() {
+      if (!this.name) {
+        this.$message.error('璇峰～鍐欎粨搴撳悕绉�')
+        return
+      }
+      this.upLoadWarehouse = true;
+      if(this.currentEdit&&this.currentEdit.id){
+        // 淇敼浠撳簱
+        upWarehouse({
+          name: this.name,
+          id:this.currentEdit.id
+        }).then(res => {
+          this.upLoadWarehouse = false;
+          this.warehouseVisible = false
+          // this.keepVisible = false
+          this.currentEdit = null;
+          this.$message.success('淇敼鎴愬姛')
+          this.selectList()
+          this.name = ''
+          this.warehouseChange(this.entity.warehouseId)
+        }).catch(err => {
+          this.upLoadWarehouse = false;
+        })
+      }else{
+        // 鏂板浠撳簱
+        addWarehouse({
+          name: this.name
+        }).then(res => {
+          this.upLoadWarehouse = false;
+          this.warehouseVisible = false
+          this.$message.success('娣诲姞鎴愬姛')
+          this.selectList()
+          this.name = ''
+          this.warehouseChange(this.entity.warehouseId)
+        }).catch(err => {
+          this.upLoadWarehouse = false;
+        })
+      }
+    },
+    // 娣诲姞/淇敼璐ф灦
+    confirmShelves() {
+      if (!this.shelves.name) {
+        this.$message.error('璇峰～鍐欒揣鏋跺悕绉�')
+        return
+      }
+      if (!this.shelves.row) {
+        this.$message.error('璇峰～鍐欒揣鏋跺眰鏁�')
+        return
+      }
+      if (!this.shelves.col) {
+        this.$message.error('璇峰～鍐欒揣鏋跺垪鏁�')
+        return
+      }
+      this.upLoadShelves = true;
+      if(this.currentEdit&&this.currentEdit.id){
+        // 淇敼
+        upShelf({
+          id:this.currentEdit.id,...this.shelves
+        }).then(res => {
+          this.upLoadShelves = false;
+          this.shelvesVisible = false
+          this.$message.success('淇敼鎴愬姛')
+          this.selectList()
+          this.currentEdit ={};
+        }).catch(err => {
+          this.upLoadShelves = false;
+        })
+      }else{
+        // 鏂板
+        addShelf({
+          warehouseId: this.entity.warehouseId,...this.shelves
+        }).then(res => {
+          this.upLoadShelves = false;
+          this.shelvesVisible = false
+          this.$message.success('娣诲姞鎴愬姛')
+          this.selectList()
+          this.shelves = {}
+        }).catch(err => {
+          this.upLoadShelves = false;
+        })
+      }
+      this.warehouseChange(this.entity.warehouseId)
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    handleNodeClick(val, node, el) { //鏍戠殑鍊�
+      this.selectTree[node.level-1] = val.id;
+    },
+    nodeOpen(data, node, el) {
+      $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
+      this.selectTree[node.level-1] = data.id;
+    },
+    nodeClose(data, node, el) {
+      $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
+    },
+    handleDelete(row, level) {
+      this.$confirm('鏄惁褰撳墠鏁版嵁?', "璀﹀憡", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning"
+      }).then(() => {
+        if (level == 1) {
+          // 鍒犻櫎浠撳簱
+          delWarehouse({
+            id: row.id
+          }).then(res => {
+            this.$message.success('鎴愬姛')
+            this.selectList()
+          }).catch(e => {
+            this.$message.error('澶辫触')
+          })
+        }else{
+          // 鍒犻櫎璐ф灦
+          delShelf({
+            id: row.id
+          }).then(res => {
+            this.$message.success('鎴愬姛')
+            this.selectList()
+          }).catch(e => {
+            this.$message.error('澶辫触')
+          })
+        }
+        this.warehouseChange(this.entity.warehouseId)
+      }).catch(() => {})
+    },
+    handleEdit(data, level) {
+      this.isEdit = true;
+      // 鍒ゆ柇鏄鍑犲眰绾э紝绗竴灞傜骇锛屼慨鏀逛粨搴擄紝绗簩灞傜骇淇敼璐ф灦
+      if (level == 1) {
+        this.warehouseVisible = true;
+        this.currentEdit = data;
+        this.name = data.name
+      } else {
+        this.shelvesVisible = true;
+        this.currentEdit = data;
+        this.shelves = {
+          name:data.name,
+          row:data.row,
+          col:data.col,
+          warehouseId:data.warehouseId
+        }
+      }
+    },
+    // 鏌ョ湅璇︽儏
+    handelDetail(row) {
+      this.currentId = row.id;
+      this.isDetail = true;
+    },
+    warehouseChange(val) {
+      this.tableList = []
+      let map = this.warehouse.find(a => {
+        return a.id === val ? a : null
+      })
+      this.shelf = map.warehouseShelfList;
+      this.entity.shelfId = '';
+    },
+    handleShelf(e){
+      if(e){
+        this.tableLoading = true;
+        getWarehouse({shelfId: e}).then(res => {
+          this.tableLoading = false;
+          let data = res.data;
+          let set =new Set()
+          this.tableList = [];
+          let arr = []
+          data.forEach(m=>{
+            set.add(m.col)
+            if(arr.length>0){
+              if(arr.find(n=>n.row==m.row)){
+                arr.push(m)
+              }else{
+                this.tableList.push(arr)
+                arr = []
+                arr.push(m)
+              }
+            }else{
+              arr.push(m)
+            }
+          })
+          this.tableList.push(arr)
+          this.rowList = [];
+          for(let i=0;i<set.size;i++){
+            this.rowList.push(`${i+1} 鍒梎)
+          }
+        }).catch(e=>{
+          this.tableLoading = false;
+        })
+      }
+    },
+    handleSearch(){
+      if(!this.searchSampleCode){
+        this.$message.error('璇疯緭鍏ユ牱鍝佺紪鍙�')
+        return;
+      }
+      searchSampleId({sampleCode: this.searchSampleCode}).then(res => {
+        if(res.code==200){
+          this.currentId = res.data;
+          this.isDetail = true;
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.title {
+  height: 60px;
+  line-height: 60px;
+}
+
+.search {
+  background-color: #fff;
+  height: 80px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+
+.search_thing {
+  display: flex;
+  align-items: center;
+  height: 50px;
+}
+
+.search_label {
+  width: 90px;
+  font-size: 14px;
+  text-align: right;
+}
+
+.search_input {
+  width: calc(100% - 120px);
+}
+
+.table {
+  margin-top: 10px;
+  background-color: #fff;
+  width: calc(100% - 40px);
+  height: calc(100% - 60px - 80px - 10px - 40px);
+  padding: 20px;
+  overflow-y: auto;
+}
+
+.el-form-item {
+  margin-bottom: 16px;
+}
+
+.btns {
+  position: absolute;
+  right: 10px;
+  top: 25px;
+  display: flex;
+  align-items: center;
+  z-index: 9;
+}
+
+.tables {
+  width: 100%;
+  height: 100%;
+  border-bottom: none;
+}
+
+.tables th {
+  font-size: 14px;
+}
+
+.tables td {
+  font-size: 12px;
+  text-align: center;
+  vertical-align: top;
+  border-color: rgb(192, 191, 191) !important;
+  padding: 5px;
+  box-sizing: border-box;
+  height: 120px;
+}
+
+.tables ul {
+  list-style-type: none;
+}
+
+.tables ul li {
+  border-radius: 3px;
+  padding: 4px 10px;
+  box-sizing: border-box;
+  margin-bottom: 5px;
+  font-size: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: start;
+  color: #333333;
+  cursor: pointer;
+  overflow: hidden; /*瓒呭嚭閮ㄥ垎闅愯棌*/
+  white-space: nowrap; /*绂佹鎹㈣*/
+  text-overflow: ellipsis; /*鐪佺暐鍙�*/
+}
+
+.tables h4 {
+  color: #999999;
+  font-size: 14px;
+  font-weight: 400;
+  padding: 6px 0;
+}
+
+.tables i {
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  margin-right: 6px;
+}
+
+li:hover {
+  background: rgba(58, 123, 250, 0.18);
+}
+
+li:hover i {
+  background: #3A7BFA;
+}
+
+li:hover .num {
+  color: #3A7BFA;
+}
+
+.green {
+  background: #E0F6EA;
+}
+
+.green i {
+  background: #34BD66;
+}
+
+.green .num {
+  color: #34BD66;
+}
+
+.el-dialog {
+  position: relative;
+}
+
+.shaoma {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  color: #3A7BFA;
+  position: absolute;
+  top: 23px;
+  right: 54px;
+  cursor: pointer;
+}
+
+.node_i {
+  color: orange;
+  font-size: 18px;
+}
+
+.custom-tree-node .el-button {
+  opacity: 0;
+}
+
+.custom-tree-node:hover .el-button {
+  opacity: 1;
+}
+>>>.el-loading-mask {
+  z-index: 10;
+}
+</style>

--
Gitblit v1.9.3