From edf8e7472645534ed5156651fe802df1ceadccfb Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 24 八月 2023 16:58:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/inspectionManagement/commissionInspection/addCommision.vue | 1020 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 541 insertions(+), 479 deletions(-)

diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index 5c44513..bebe006 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -1,488 +1,550 @@
 <template>
-	<div class="add_commision">
-		<div class="content-main">
-			<div class="firstBox">
-				<div class="title">濮旀墭淇℃伅</div>
-				<div class="tableBox">
-					<div class="tableBox-header">
-						<el-button class="split" @click="dialogueFormVisible = true" type="primary" size="small"
-							style="background-color: rgb(1, 102, 226);">娣诲姞鏍峰搧</el-button>
-						<!-- <el-input v-model="searchData" 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="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="detectionInfo" style="width: 100%">
-						<el-table-column type="index" label="搴忓彿" min-width="10%" />
-						<el-table-column prop="sampleNumber" label="鏍峰搧缂栧彿" min-width="8%" />
-						<el-table-column prop="sampleName" label="鏍峰搧鍚嶇О" min-width="10%" />
-						<el-table-column prop="specificationsModels" label="瑙勬牸鍨嬪彿" min-width="10%" />
-						<el-table-column prop="unit" label="鍗曚綅" min-width="8%" />
-						<el-table-column prop="samplesNumber" label="鏁伴噺" min-width="8%" />
-						<el-table-column prop="addway" label="娣诲姞鏂瑰紡" min-width="8%">
-							<template slot-scope="scope">
-								<div v-if="scope.row.addway === 0">
-									<el-tag :type='success' disable-transitions>鎵弿</el-tag>
-								</div>
-								<div v-if="scope.row.addway === 1">
-									<el-tag :type='primary' disable-transitions>褰曞叆</el-tag>
-								</div>
-								<div v-else></div>
-							</template>
-						</el-table-column>
-						<el-table-column prop="experiment" label="璇曢獙" min-width="8%" />
-						<el-table-column prop="remarks" label="澶囨敞" min-width="8%" />
-						<el-table-column label="鎿嶄綔" min-width="8%">
-							<template slot-scope="scope">
-								<el-button type="text" size="small">淇敼</el-button>
-								<el-button type="text" size="small" @click="deleteRow(scope.row)">鍒犻櫎</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
-					<!-- 鍒嗛〉鍣� -->
-					<div>
-						<el-pagination class="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-							:current-page="currentPage" :page-sizes="[100, 200, 300, 400]" :page-size="100"
-							layout="total, sizes, prev, pager, next, jumper" :total="400">
-						</el-pagination>
-					</div>
-				</div>
-				<div class="secondBox">
-					<el-row class="header">
-						<el-col :span="12">鍩烘湰淇℃伅</el-col>
-						<el-col :span="12" style="text-align: right;">
-							<!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
-							<el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">鎵撳嵃濮旀墭鍗�</el-button>
-						</el-col>
-					</el-row>
-					<el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="right" label-width="100px"
-						size="mini">
-						<div class="formwrapper">
-							<el-row :gutter="200">
-								<el-col :span="5">
-									<el-form-item label="濮旀墭缂栧彿锛�">
-										<el-input style="width: 160px" type="text" :value="infoForm.commisioncode" readonly disabled
-											autocomplete="off" />
-									</el-form-item>
-								</el-col>
-								<el-col :span="5">
-									<el-form-item label="濮旀墭鍗曚綅锛�">
-										<el-input style="width: 160px" v-model="infoForm.department" placeholder="璇疯緭鍏ュ鎵樺崟浣�" />
-									</el-form-item>
-								</el-col>
-								<el-col :span="5">
-									<el-form-item label="鑱旂郴浜猴細">
-										<el-input style="width: 160px" v-model="infoForm.contacter" placeholder="璇疯緭鍏ュ鎵樺崟浣�" />
-									</el-form-item>
-								</el-col>
-								<el-col :span="5">
-									<el-form-item label="鑱旂郴鐢佃瘽锛�">
-										<el-input style="width: 160px" v-model="infoForm.tel" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
-									</el-form-item>
-								</el-col>
-							</el-row>
-							<el-row :gutter="200">
-								<el-col :span="5">
-									<el-form-item label="鑱旂郴鍦板潃锛�">
-										<el-input style="width: 160px;" v-model="infoForm.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�"
-											autocomplete="off" />
-									</el-form-item>
-								</el-col>
-								<el-col :span="5">
-									<el-form-item label="瀹屾垚鏈熼檺锛�">
-										<el-date-picker v-model="infoForm.deadline" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 160px;">
-										</el-date-picker>
-									</el-form-item>
-								</el-col>
-								<el-col :span="5">
-									<el-form-item label="閫佹牱鏃堕棿锛�">
-										<el-date-picker v-model="infoForm.time" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 160px;">
-										</el-date-picker>
-									</el-form-item>
-								</el-col>
-								<el-col :span="5">
-									<el-form-item label="閫佹牱鏂瑰紡锛�">
-										<el-select style="width: 160px;" v-model="infoForm.way" size="small" placeholder="閫佹牱">
-											<el-option v-for="options in sampleDeliveryMode" :key="options.key"
-												:value="options.value">{{ options.value }}</el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							<el-row :gutter="200">
-								<el-col :span="5">
-									<el-form-item label="閫佹牱浜猴細">
-										<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: 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: 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: 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" @click="submitInspection"
-								style="background-color: rgb(1, 102, 226);">鎻愪氦</el-button>
-						</div>
-					</el-form>
-				</div>
-			</div>
-			<div class="checkType">
-				<el-dialog title="娣诲姞鎸囨爣" :visible.sync="dialogueFormVisible" width="40%">
-					<el-form :model="addPointerForm" ref="addPointerForm" class="addPointerForm" label-position="right"
-						label-width="100px" size="mini">
-						<el-row :gutter="50">
-							<el-col :span="10">
-								<el-form-item label="鏍峰搧缂栧彿锛�">
-									<el-select style="width: 160px;" v-model="addPointerForm.sampleNumber" size="small"
-										placeholder="璇烽�夋嫨鏍峰搧缂栧彿">
-										<el-option v-for="options in samplecodeoptions" :value="options.value"
-											:key="options.key">{{ options.value }}</el-option>
-									</el-select>
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item label="鏍峰搧鍚嶇О锛�">
-									<el-select style="width: 160px;" v-model="addPointerForm.sampleName" size="small"
-										placeholder="璇烽�夋嫨鏍峰搧鍚嶇О">
-										<el-option v-for="options in sampleoptions" :value="options.value"
-											:key="options.key">{{ options.value }}</el-option>
-									</el-select>
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="10">
-								<el-form-item label="瑙勬牸鍨嬪彿锛�">
-									<el-select style="width: 160px;" v-model="addPointerForm.specificationsModels" size="small"
-										placeholder="璇烽�夋嫨鏍峰搧鍚嶇О">
-										<el-option v-for="options in model_spe_options" :value="options.value"
-											:key="options.key">{{ options.value }}</el-option>
-									</el-select>
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item label="鏍峰搧鍗曚綅锛�">
-									<el-input style="width: 160px" type="text" v-model="addPointerForm.unit" placeholder="璇疯緭鍏ュ崟浣�"
-										autocomplete="off" />
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="10">
-								<el-form-item label="鏍峰搧鏁伴噺锛�">
-									<el-input style="width: 160px" type="text" v-model="addPointerForm.samplesNumber" placeholder="璇疯緭鍏ユ暟閲�"
-										autocomplete="off" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item label="澶囨敞锛�">
-									<el-input style="width: 160px" type="text" v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�"
-										autocomplete="off" />
-								</el-form-item>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="10">
-								<el-form-item label="娣诲姞瀹為獙锛�">
-									<el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
-										<el-checkbox v-for="expers in experList" :label="expers.label"
-											:key="expers.key">{{ expers.label }}</el-checkbox>
-									</el-checkbox-group>
-								</el-form-item>
-							</el-col>
-						</el-row>
-					</el-form>
-					<span slot="footer" class="dialog-footer">
-						<el-button type="primary" @click="addInspection">娣诲姞</el-button>
-						<el-button @click="dialogueFormVisible = false">鍙� 娑�</el-button>
-					</span>
-				</el-dialog>
-			</div>
-		</div>
-	</div>
+  <div class="add_commision">
+  <div class="content-main">
+    <div class="firstBox">
+      <div class="title">濮旀墭淇℃伅</div>
+      <div class="tableBox">
+        <div class="tableBox-header">
+        <el-button class="split" @click="dialogueFormVisible = true" type="primary" size="small" style="background-color: rgb(1, 102, 226);">娣诲姞鏍峰搧</el-button>
+<!--        <el-input
+          v-model="searchData"
+          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="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="detectionInfo"
+                style="width: 100%"
+              >
+                <el-table-column
+                  type="index"
+                  label="搴忓彿"
+                  min-width="10%"
+                />
+                <el-table-column
+                  prop="sampleNumber"
+                  label="鏍峰搧缂栧彿"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="sampleName"
+                  label="鏍峰搧鍚嶇О"
+                  min-width="10%"
+                />
+                <el-table-column
+                  prop="specificationsModels"
+                  label="瑙勬牸鍨嬪彿"
+                  min-width="10%"
+                />
+                <el-table-column
+                  prop="unit"
+                  label="鍗曚綅"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="samplesNumber"
+                  label="鏁伴噺"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="addway"
+                  label="娣诲姞鏂瑰紡"
+                  min-width="8%">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.addway === 0">
+                      <el-tag :type= 'success' disable-transitions>鎵弿</el-tag>
+                    </div>
+                    <div v-if="scope.row.addway === 1">
+                      <el-tag :type= 'primary' disable-transitions>褰曞叆</el-tag>
+                    </div>
+                    <div v-else></div>
+                </template>
+                </el-table-column>
+                <el-table-column
+                  prop="experiment"
+                  label="璇曢獙"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="remarks"
+                  label="澶囨敞"
+                  min-width="8%"
+                />
+                <el-table-column
+                  label="鎿嶄綔"
+                  min-width="8%"
+                >
+                  <template slot-scope="scope">
+                    <el-button type="text" size="small">淇敼</el-button>
+                    <el-button type="text" size="small" @click="deleteRow(scope.row)">鍒犻櫎</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <!-- 鍒嗛〉鍣� -->
+              <div>
+                <el-pagination
+                  class="pagination"
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-sizes="[100, 200, 300, 400]"
+                  :page-size="100"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="400">
+                </el-pagination>
+              </div>
+      </div>
+      <div class="secondBox">
+        <el-row class="header">
+            <el-col :span="12">鍩烘湰淇℃伅</el-col>
+            <el-col :span="12" style="text-align: right;">
+            <!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
+            <!-- <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">鎵撳嵃濮旀墭鍗�</el-button> -->
+            </el-col>
+        </el-row>
+            <el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="right" label-width="100px" size="mini" >
+              <div class="formwrapper">
+                  <el-row :gutter="200">
+                        <el-col :span="5">
+                        <el-form-item label="濮旀墭缂栧彿锛�">
+                            <el-input style="width: 160px" type="text" :value="infoForm.commisioncode" readonly disabled="true" autocomplete="off" />
+                        </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                        <el-form-item label="濮旀墭鍗曚綅锛�">
+                          <el-input style="width: 160px" v-model="infoForm.department" placeholder="璇疯緭鍏ュ鎵樺崟浣�"  />
+                        </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                        <el-form-item label="鑱旂郴浜猴細">
+                          <el-input style="width: 160px" v-model="infoForm.contacter" placeholder="璇疯緭鍏ュ鎵樺崟浣�"  />
+                        </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                        <el-form-item label="鑱旂郴鐢佃瘽锛�">
+                          <el-input style="width: 160px" v-model="infoForm.tel" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+                        </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row :gutter="200">
+                        <el-col :span="5">
+                        <el-form-item label="鑱旂郴鍦板潃锛�" >
+                          <el-input style="width: 160px;" v-model="infoForm.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" autocomplete="off" />
+                        </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                        <el-form-item label="瀹屾垚鏈熼檺锛�">
+                            <el-date-picker
+                              v-model="infoForm.deadline"
+                              type="date"
+                              placeholder="閫夋嫨鏃ユ湡"
+                              style="width: 160px;">
+                            </el-date-picker>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                        <el-form-item label="閫佹牱鏃堕棿锛�">
+                            <el-date-picker
+                              v-model="infoForm.time"
+                              type="date"
+                              placeholder="閫夋嫨鏃ユ湡"
+                              style="width: 160px;">
+                            </el-date-picker>
+                        </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                        <el-form-item label="閫佹牱鏂瑰紡锛�">
+                          <el-select style="width: 160px;" v-model="infoForm.way" size="small" placeholder="閫佹牱">
+                                <el-option v-for="options in sampleDeliveryMode" :key="options.key" :value="options.value">{{ options.value }}</el-option>
+                            </el-select>
+                        </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row :gutter="200">
+                        <el-col :span="5">
+                        <el-form-item label="閫佹牱浜猴細" >
+                          <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: 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: 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: 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" @click="submitInspection" style="background-color: rgb(1, 102, 226);">鎻愪氦</el-button>
+                      <!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
+                      <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">鎵撳嵃濮旀墭鍗�</el-button>
+                    </div>
+                </el-form>
+      </div>
+    </div>
+    <div class="checkType">
+      <el-dialog
+        title="娣诲姞鎸囨爣"
+        :visible.sync="dialogueFormVisible"
+        width="40%"
+      >
+        <el-form :model="addPointerForm" ref="addPointerForm" class="addPointerForm" label-position="right" label-width="100px" size="mini">
+          <el-row :gutter="50">
+            <el-col :span="10">
+              <el-form-item label="鏍峰搧缂栧彿锛�">
+                <el-select style="width: 160px;" v-model="addPointerForm.sampleNumber" size="small" placeholder="璇烽�夋嫨鏍峰搧缂栧彿">
+                  <el-option v-for="options in samplecodeoptions" :value="options.value" :key="options.key" >{{ options.value }}</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="鏍峰搧鍚嶇О锛�">
+                <el-select style="width: 160px;" v-model="addPointerForm.sampleName" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О">
+                  <el-option v-for="options in sampleoptions" :value="options.value" :key="options.key">{{ options.value }}</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="50">
+            <el-col :span="10">
+              <el-form-item label="瑙勬牸鍨嬪彿锛�">
+                <el-select style="width: 160px;" v-model="addPointerForm.specificationsModels" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О">
+                  <el-option v-for="options in model_spe_options" :value="options.value" :key="options.key">{{ options.value }}</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="鏍峰搧鍗曚綅锛�">
+                <el-input style="width: 160px" type="text" v-model="addPointerForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="50">
+            <el-col :span="10">
+              <el-form-item label="鏍峰搧鏁伴噺锛�">
+                <el-input style="width: 160px" type="text" v-model="addPointerForm.samplesNumber" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="澶囨敞锛�">
+                <el-input style="width: 160px" type="text" v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="50">
+            <el-col :span="10">
+              <el-form-item label="娣诲姞瀹為獙锛�">
+                <el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
+                  <el-checkbox v-for="expers in experList" :label="expers.label" :key="expers.key">{{ expers.label }}</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+              </el-form>
+              <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="addInspection">娣诲姞</el-button>
+                <el-button @click="dialogueFormVisible = false">鍙� 娑�</el-button>
+              </span>
+      </el-dialog>
+          </div>
+  </div>
+</div>
 </template>
 
 <script>
-	import {
-		getSampleName,
-		getModelSpecification,
-		getlink,
-		addInspection,
-		isIfViewUUID
-	} from '@/api/inspection/commisioninspection'
-	import {
-		time
-	} from 'echarts';
-	export default {
-		data() {
-			return {
-				currentPage: 0,
-				searchData: '',
-				infoForm: {
-					commisioncode: '',
-					department: '',
-					contacter: '',
-					tel: '',
-					address: '',
-					deadline: '',
-					time: '',
-					way: '',
-					sender: '',
-					sendertel: '',
-					num: '',
-					other: ''
-				},
-				detectionInfo: [],
-				addPointerForm: {
-					sampleNumber: '',
-					sampleName: '',
-					specificationsModels: '',
-					unit: '',
-					samplesNumber: '',
-					remarks: '',
-					experiment: [],
-					addway: ''
-				},
-				experList: [{
-					key: '1',
-					label: '澶栬妫�鏌�'
-				}, {
-					key: '2',
-					label: '鍔ㄤ綔鐢靛帇璇曢獙'
-				}, {
-					key: '3',
-					label: '鐢甸樆绠℃硠婕忕數娴佽瘯楠�'
-				}, {
-					key: '4',
-					label: '缁濈紭閮ㄥ垎浜ゆ祦鑰愬帇璇曢獙'
-				}],
-				sampleoptions: [{
-					key: '1',
-					value: '閫夐」1'
-				}, {
-					key: '2',
-					value: '閫夐」2'
-				}],
-				samplecodeoptions: [{
-					key: '1',
-					value: ''
-				}],
-				model_spe_options: [{
-					key: '1',
-					value: '閫夐」1'
-				}, {
-					key: '2',
-					value: '閫夐」2'
-				}],
-				sampleDeliveryMode: [{
-					key: '1',
-					value: '閫佹牱'
-				}, {
-					key: '2',
-					value: '涓婇棬'
-				}],
-				dialogueFormVisible: false
-			}
-		},
-		created() {
-			this.getlink(this.$route.params.viewId)
-			console.log();
-		},
-		mounted() {
-			// this.getSampleName()
-			// this.getModelSpecification()
-		},
-		methods: {
-			// 鑾峰彇閾炬帴link
-			getlink(viewId) {
-				if (viewId == null) {
-					this.$message.error('褰撳墠閾炬帴涓嶅湪鏈夋晥鏈熷唴,绯荤粺鑷姩鍏抽棴')
-					this.$router.push('/404')
-					return
-				}
-				isIfViewUUID({
-					viewId
-				}).then(res => {
-					if (!res.data) {
-						this.$message.error('褰撳墠閾炬帴涓嶅湪鏈夋晥鏈熷唴,绯荤粺鑷姩鍏抽棴')
-						this.$router.push('/404')
-					}
-				})
-			},
-			async getSampleName() {
-				const res = await getSampleName()
-				this.sampleoptions = res.data.map((item) => {
-					return {
-						key: item.id.toString(),
-						value: item.name
-					}
-				})
-				this.samplecodeoptions = res.data.map((item) => {
-					return {
-						key: item.id.toString(),
-						value: item.code
-					}
-				})
-			},
-			async getModelSpecification() {
-				const res = await getModelSpecification({
-					materialId: '1'
-				})
-				this.model_spe_options = res.data.map((item) => {
-					return {
-						key: item.specificationsId,
-						value: item.specificationsName
-					}
-				})
-			},
-			addInspection() {
-				let exper = this.addPointerForm.experiment[0]
-				this.addPointerForm.addway = 1
-				for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
-					exper += ',' + this.addPointerForm.experiment[i]
-				}
-				this.addPointerForm.experiment = exper
-				let tmp = this.addPointerForm
-				this.detectionInfo.push(tmp)
-				this.dialogueFormVisible = false
-				this.addPointerForm = {
-					sampleNumber: '',
-					sampleName: '',
-					specificationsModels: '',
-					unit: '',
-					samplesNumber: '',
-					remarks: '',
-					experiment: [],
-					addway: ''
-				}
-			},
-			async submitInspection() {
-				let sampledeliveryway
-				if (this.infoForm.way === '閫佹牱') {
-					sampledeliveryway = 1
-				} else {
-					sampledeliveryway = 2
-				}
-				const res = await addInspection({
-					completionDeadline: this.infoForm.deadline,
-					contactAddress: this.infoForm.address,
-					contactNumber: this.infoForm.tel,
-					contacts: this.infoForm.contacter,
-					entrustRemarks: this.infoForm.other,
-					entrusted: this.infoForm.department,
-					inspectionTime: this.infoForm.time,
-					linkDetectionList: this.detectionInfo,
-					reportNumber: parseInt(this.infoForm.num),
-					sampleDeliveryMode: sampledeliveryway,
-					sampleDeliveryPhone: this.infoForm.sendertel,
-					sampleSender: this.infoForm.sender
-				})
-				this.infoForm.commisioncode = res.data
-				if (res.data) {
-					this.$message({
-						message: '鎭枩浣�!',
-						type: 'success'
-					})
-					// 璺宠浆椤甸潰
-					this.$router.push('/inspectionManagement/commissionInspection')
-				} else {
-					this.$message.error(res.message)
-				}
-			},
-			handleSizeChange(pageSize) {
-				this.pageParams.pageSize = pageSize
-			},
-			handleCurrentChange(pageNo) {
-				this.pageParams.pageNo = pageNo
-			},
-			deleteRow(row) {
-				console.log(row)
-				row = null
-			}
-		}
-	}
+import {getSampleName, getModelSpecification, getlink, addInspection} from '@/api/inspection/commisioninspection'
+export default {
+  data() {
+    return {
+      currentPage: 0,
+      searchData: '',
+      infoForm: {
+        commisioncode: '',
+        department: '',
+        contacter: '',
+        tel: '',
+        address: '',
+        deadline: '',
+        time: '',
+        way: '',
+        sender: '',
+        sendertel: '',
+        num: '',
+        other: ''
+      },
+      detectionInfo: [],
+      addPointerForm:{
+        sampleNumber: '',
+        sampleName: '',
+        specificationsModels: '',
+        unit: '',
+        samplesNumber: '',
+        remarks: '',
+        experiment: [],
+        addway: ''
+      },
+      experList:[{
+        key: '1',
+        label: '澶栬妫�鏌�'
+      },{
+        key: '2',
+        label: '鍔ㄤ綔鐢靛帇璇曢獙'
+      },{
+        key: '3',
+        label: '鐢甸樆绠℃硠婕忕數娴佽瘯楠�'
+      },{
+        key: '4',
+        label: '缁濈紭閮ㄥ垎浜ゆ祦鑰愬帇璇曢獙'
+      }],
+      sampleoptions:[{
+        key:'1',
+        value: '閫夐」1'
+      },{
+        key:'2',
+        value: '閫夐」2'
+      }],
+      samplecodeoptions:[{
+        key:'1',
+        value: ''
+      }],
+      model_spe_options:[{
+        key:'1',
+        value: '閫夐」1'
+      },{
+        key: '2',
+        value: '閫夐」2'
+      }],
+      sampleDeliveryMode:[{
+        key: '1',
+        value: '閫佹牱'
+      },{
+        key: '2',
+        value: '涓婇棬'
+      }],
+      dialogueFormVisible: false,
+      showDetail: false
+    }
+  },
+  created(){
+    this.getlink()
+  },
+  mounted(){
+    this.getSampleName()
+    this.getModelSpecification()
+  },
+  methods: {
+    // 鑾峰彇閾炬帴link
+    getlink(){
+      getlink().then((result)=>{
+        this.$store.commit('settings/SAVE_LINK',result.data)
+        console.log(this.$store.state.settings.link)
+      })
+    },
+    async getSampleName(){
+      const res = await getSampleName()
+      // console.log('res',res.data)
+      this.sampleoptions = res.data.map((item)=>{
+        return{
+          key:item.id.toString(),
+          value:item.name
+        }
+      })
+      this.samplecodeoptions = res.data.map((item)=>{
+        return{
+          key:item.id.toString(),
+          value:item.code
+        }
+      })
+    },
+    async getModelSpecification(){
+      const res = await getModelSpecification({materialId: '1'})
+      // console.log(res)
+      this.model_spe_options = res.data.map((item)=>{
+        return{
+          key:item.specificationsId,
+          value:item.specificationsName
+        }
+      })
+    },
+    addInspection(){
+      let exper = this.addPointerForm.experiment[0]
+      this.addPointerForm.addway = 1
+      for(let i=1;i<this.addPointerForm.experiment.length;i++){
+        exper += ',' + this.addPointerForm.experiment[i]
+      }
+      // console.log(exper)
+      this.addPointerForm.experiment = exper
+      let tmp = this.addPointerForm
+      this.detectionInfo.push(tmp)
+      this.dialogueFormVisible = false
+      this.addPointerForm ={
+        sampleNumber: '',
+        sampleName: '',
+        specificationsModels: '',
+        unit: '',
+        samplesNumber: '',
+        remarks: '',
+        experiment: [],
+        addway: ''
+      }
+    },
+    async submitInspection(){
+      let sampledeliveryway
+      if(this.infoForm.way === '閫佹牱'){
+        sampledeliveryway = 1
+      }else{
+        sampledeliveryway = 2
+      }
+      const res = await addInspection({completionDeadline: this.infoForm.deadline,
+        contactAddress: this.infoForm.address,
+        contactNumber: this.infoForm.tel,
+        contacts: this.infoForm.contacter,
+        entrustRemarks: this.infoForm.other,
+        entrusted: this.infoForm.department,
+        inspectionTime: this.infoForm.time,
+        linkDetectionList: this.detectionInfo,
+        reportNumber: parseInt(this.infoForm.num),
+        sampleDeliveryMode: sampledeliveryway,
+        sampleDeliveryPhone: this.infoForm.sendertel,
+        sampleSender: this.infoForm.sender})
+//       const res = await addInspection({
+//   completionDeadline: "2023-08-03",
+//   contactAddress: "姹熻嫃鍗楅��",
+//   contactNumber: "12321423432",
+//   contacts: "灏忛粦",
+//   entrustRemarks: "濮旀墭澶囨敞YPBH123456789YPBH123456789YPBH123456789",
+//   entrusted: "闃块噷宸村反",
+//   inspectionTime: "2023-08-03",
+//   linkDetectionList: [
+//     {
+//       "experiment": "鍋氭ⅵ",
+//       "remarks": "閫氳繃浜�",
+//       "sampleName": "鍙戝姩鏈�",
+//       "sampleNumber": "YPBH123456789",
+//       "samplesNumber": 20,
+//       "specificationsModels": "GGXH-AAAAA",
+//       "unit": "鐧惧害"
+//     }
+//   ],
+//   reportNumber: 23,
+//   sampleDeliveryMode: 1,
+//   sampleDeliveryPhone: "123456789676",
+//   sampleSender: "灏忕櫧"
+// })
+      // console.log(res)
+      this.infoForm.commisioncode = res.data
+      if(res.data){
+        this.$message({
+          message: '鎭枩浣�!',
+          type: 'success'
+        })
+        // 璺宠浆椤甸潰
+        this.$router.push('/inspectionManagement/commissionInspection')
+        this.showDetail = true
+      }else{
+        this.$message.error(res.message)
+      }
+    },
+    handleSizeChange(pageSize) {
+      this.pageParams.pageSize = pageSize
+    },
+    handleCurrentChange(pageNo) {
+      this.pageParams.pageNo = pageNo
+    },
+    deleteRow(row){
+      console.log(row)
+      row = null
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	.add_commision{
-		padding: 20px;
-	}
-	
-	.firstBox {
-		.title {
-			padding: 15px 10px;
-			font-size: 18px;
-			background-color: #0166e2;
-			color: #fff;
-			border-radius: 4px;
-		}
+.add_commision{
+  padding: 20px;
+}
 
-		.tableBox {
-			background-color: #fff;
-			padding: 0px 20px;
-			margin: 0px -15px;
-			flex: 1;
-			background: #fff;
-			/* padding: 20px 20px 10px 20px; */
-			display: flex;
-			flex-direction: column;
+.content-main{
+  padding: 20px 40px;
+  background-color: #f0f2f5;
+  width: 100%;
+  height: 100vh;
 
-			.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>
\ No newline at end of file
+.firstBox{
+  .title {
+    padding: 15px 10px;
+    font-size: 18px;
+    background-color: #0166e2;
+    color: #fff;
+    border-radius: 4px;
+  }
+  .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: 40px;
+    margin-top: 20px;
+  }
+}
+.infoForm{
+  background-color: #fff;
+  padding: 20px 50px;
+  .formwrapper{
+    margin: 20px 0px;
+    padding-left: 30px;
+    .el-row{
+      margin: 10px 0px;
+    }
+  }
+}
+}
+</style>

--
Gitblit v1.9.3