From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/b1-inspection-order.vue |  422 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 384 insertions(+), 38 deletions(-)

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 8566f6b..cf1c56b 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -9,6 +9,7 @@
 		height: 80px;
 		display: flex;
 		align-items: center;
+    overflow: hidden;
 	}
 
 	.search_thing {
@@ -67,43 +68,128 @@
 	.el-form-item {
 		margin-bottom: 16px;
 	}
+  .box-card >>>.el-radio__inner {
+    border-radius: 2px !important;
+  }
+  .box-card >>>.el-radio__input.is-checked .el-radio__inner::after {
+    content: '';
+    width: 8px;
+    height: 3px;
+    border: 1px solid white;
+    border-top: transparent;
+    border-right: transparent;
+    text-align: center;
+    display: block;
+    position: absolute;
+    top: 3px;
+    left: 2px;
+    transform: rotate(-45deg);
+    border-radius: 0px;
+    background: none;
+  }
+  >>>.el-radio__label{
+    color: #000 !important;
+  }
+  .el-dialog__body >>>.el-radio__label{
+    font-size: 8px;
+  }
+  .el-dialog__body >>>.el-radio__input.is-checked .el-radio__inner::after {
+    content: '';
+    width: 4px;
+    height: 3px;
+    border: 1px solid #000;
+    border-top: transparent;
+    border-right: transparent;
+    text-align: center;
+    display: block;
+    position: absolute;
+    top: 1px;
+    left: 2px;
+    transform: rotate(-45deg);
+    border-radius: 0px;
+    background: none;
+  }
+  >>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+    background: #3A7BFA;
+  }
+  .el-dialog__body >>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+    background: transparent;
+  }
+  .el-dialog__body >>>.el-radio__inner{
+    width: 8px !important;
+    height: 8px !important;
+  }
+  .el-dialog__body >>>.el-radio__label{
+     padding-left: 2px !important;
+  }
+  .el-dialog__body >>>.el-card__body{
+    padding: 0 !important;
+  }
+  .el-dialog__body >>>.el-card {
+    border: none;
+  }
+  .el-dialog__body >>>.el-radio__input.is-disabled .el-radio__inner{
+    border-color: #000 !important;
+  }
+  .el-dialog__body >>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+    border: none !important;
+  }
+  .scor{
+    width: 3px;
+    height: 3px;
+    border-radius: 1px;
+    border: 1px solid #000;
+    display: inline-block;
+  }
+  .ellipsis-multiline {
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-wrap: break-word;
+    max-height: 3.0em; /* 楂樺害涓哄瓧浣撳ぇ灏忕殑涓ゅ�� */
+    line-height: 1.5em; /* 琛岄珮 */
+    height: 3.0em; /* 楂樺害涓鸿楂樼殑涓ゅ�� */
+  }
 </style>
 
 <template>
 	<div class="inspection_order">
-		<div style="width: 100%;height: 100%;" v-if="active == 0">
+		<div style="width: 100%;height: 100%;" v-show="active == 0">
 			<div>
 				<el-row class="title">
-					<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
+					<el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屼笅鍗�</el-col>
 					<el-col :span="12" style="text-align: right;">
+            <el-button size="medium" type="primary" @click="print">鏍囩鎵撳嵃</el-button>
 						<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
 					</el-col>
 				</el-row>
 			</div>
 			<div class="search" :style="`height: ${more?130:80}px;`">
-        <el-row :gutter="10">
-          <el-col :span="20" style="display: flex;align-items: center;flex-wrap: wrap;">
-            <div class="search_thing">
+        <el-row :gutter="10" style="width: 100%;">
+          <el-col :span="20" style="display: flex;flex-wrap: wrap;">
+            <div class="search_thing" style="width: 20%;">
               <div class="search_label">濮旀墭缂栧彿锛�</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
                   v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
-            <div class="search_thing">
+            <div class="search_thing" style="width: 20%;">
               <div class="search_label">鏍峰搧鍚嶇О锛�</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-                  v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+                  v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
-            <div class="search_thing">
+            <div class="search_thing" style="width: 20%;">
               <div class="search_label">鏍峰搧鍨嬪彿锛�</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
                   v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
-            <div class="search_thing">
+            <div class="search_thing" style="width: 20%;">
               <div class="search_label">鏍峰搧缂栧彿锛�</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
                   v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
-            <div class="search_thing">
+            <div class="search_thing" style="width: 20%;">
               <div class="search_label">涓嬪崟鏃堕棿锛�</div>
               <div class="search_input">
                 <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
@@ -116,24 +202,24 @@
                 </el-date-picker>
               </div>
             </div>
-            <div class="search_thing" v-show="more">
+            <div class="search_thing" style="width: 20%;" v-if="more">
               <div class="search_label">涓嬪崟浜猴細</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-                  v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
+                  v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
-            <div class="search_thing" v-show="more">
+            <div class="search_thing" style="width: 20%;" v-if="more">
               <div class="search_label">宸ョ▼鍚嶇О锛�</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-                  v-model="componentData.entity.value2" @keyup.enter.native="refreshTable()"></el-input></div>
+                  v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
-            <div class="search_thing" v-show="more">
+            <div class="search_thing" style="width: 20%;" v-if="more">
               <div class="search_label">鐢熶骇鍗曚綅锛�</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-                  v-model="componentData.entity.value3" @keyup.enter.native="refreshTable()"></el-input></div>
+                  v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
           </el-col>
           <el-col :span="4">
-            <div class="search_thing" style="padding-left: 10px;">
+            <div class="search_thing">
               <el-button type="text" :icon="!more?'el-icon-arrow-down':'el-icon-arrow-up'" style="color: #3A7BFA;" @click="more=!more">{{!more?'鏇村':'鏀惰捣'}}</el-button>
               <el-button size="small" @click="refresh()">閲� 缃�</el-button>
               <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -145,7 +231,7 @@
 				<ul class="tab">
 					<li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
 				</ul>
-				<ValueTable :style="'height: calc(100% - '+(more?'94':'44')+'px)'" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
+				<ValueTable :style="getStyle()" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
 					:key="'b'+upIndex"  />
 			</div>
 			<!-- 瀹℃牳 -->
@@ -203,8 +289,17 @@
 						<el-col class="search_thing" style="width: 95%;">
 							<div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>鎸囨淳浜哄憳锛�</div>
 							<div class="search_input">
-								<el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable>
+								<el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable @change="changeUser">
 									<el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
+									</el-option>
+								</el-select>
+							</div>
+						</el-col>
+            <el-col class="search_thing" style="width: 95%;" v-if="distributeData.userId">
+							<div class="search_label"><span class="required-span" >* </span>璇曢獙瀹わ細</div>
+							<div class="search_input">
+								<el-select v-model="distributeData.sonLaboratory" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable>
+									<el-option v-for="(item,i) in sonLaboratoryList" :key="i" :label="item.label" :value="item.value">
 									</el-option>
 								</el-select>
 							</div>
@@ -227,23 +322,130 @@
 		</div>
 		<div style="width: 100%;height: 100%;" v-if="active >0">
 			<Add :active="active" :currentId="currentId" v-if="active<4" />
-      <fiberOpticConfig :currentId="currentId" v-if="active==4" />
 		</div>
+    <el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="40%" top="5vh">
+      <div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
+        <div class="dia_body">
+          <el-checkbox
+          style="margin: 10px 5px;"
+          :indeterminate="isIndeterminate"
+          v-model="checkAll"
+          @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
+          <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
+            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
+                  <el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
+                   <div>
+                    <el-row style="font-size: 14px;padding-left: 20px;">
+                        <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
+                    </el-row>
+                    <div style="display: flex;">
+                      <div>
+                        <el-col :span="8" :offset="4">
+                          <vueQr :text="JSON.stringify(item.sampleCode)" :size="140" :margin="2"></vueQr>
+                        </el-col>
+                      </div>
+                      <div style="margin-left: 50px;width: 100%;">
+                        <el-row>
+                          <el-col  style="font-weight: bold;font-size: 14px;"><span>鏍峰搧缂栧彿:&nbsp; </span>{{ item.sampleCode }}</el-col>
+                        </el-row>
+                        <el-row style="margin-top: 1px;font-size: 14px;">
+                          <el-col  style="font-weight: bold;"><span>濮旀墭鍗曞彿:&nbsp; </span>{{ item.code }}</el-col>
+                        </el-row>
+                        <el-row style="margin-top: 1px;font-size: 14px;">
+                          <el-col  style="font-weight: bold;"><span>瑙勬牸鍨嬪彿:&nbsp; </span>{{ item.model }}</el-col>
+                        </el-row>
+                        <el-row style="margin-top: 1px;font-size: 14px;">
+                          <el-col  style="font-weight: bold;"><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sampleName }}</el-col>
+                        </el-row>
+                        <el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
+                          <el-col  style="font-weight: bold;"><span>妫�娴嬮」鐩�:&nbsp; </span>{{ item.item }}</el-col>
+                        </el-row>
+                        <el-row style="margin-top: 3px;font-size: 14px;">
+                          <el-col  style="font-weight: bold;display: flex;align-items: center;"><span>鏍峰搧鐘舵��:&nbsp; </span><el-radio-group :value="item.insState" style="margin-top: 7px;margin-left: 4px;" disabled>
+                            <el-radio :label="0" style="font-weight: bold;margin-right: 7px;">寰呮</el-radio>
+                            <el-radio :label="1" style="font-weight: bold;margin-right: 7px;">鍦ㄦ</el-radio>
+                            <el-radio :label="2" style="font-weight: bold;margin-right: 7px;">宸叉</el-radio>
+                          </el-radio-group><el-radio :label="1" style="font-weight: bold;margin-top: 7px;" v-model="item.isLeave" disabled>鐣欐牱</el-radio></el-col>
+                        </el-row>
+                      </div>
+                  </div>
+                  </div>
+            </el-card>
+          </el-checkbox-group>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-row>
+          <el-button @click="printDialogVisible=false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="submitPrint" :loading="printLoading">鎵� 鍗�</el-button>
+        </el-row>
+      </span>
+    </el-dialog>
+    <div class="el-dialog__body" style="display:none;overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;">
+        <div id="printMOrder">
+          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-after: always;color: #000;box-shadow: none;" >
+            <div style="display: flex;">
+              <div>
+                <el-col :span="10" :offset="2">
+                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
+                </el-col>
+              </div>
+              <div style="margin-left: 12px;line-height: 9px;">
+                <el-row>
+                  <el-col  style="font-size: 8px;"><span>鏍峰搧缂栧彿:&nbsp; </span>{{ item.sampleCode }}</el-col>
+                </el-row>
+                <el-row style="font-size: 8px;">
+                  <el-col><span>濮旀墭鍗曞彿:&nbsp; </span>{{ item.code }}</el-col>
+                </el-row>
+                <el-row style="font-size: 8px;">
+                  <el-col><span>瑙勬牸鍨嬪彿:&nbsp; </span>{{ item.model }}</el-col>
+                </el-row>
+                <el-row style="font-size: 8px;">
+                  <el-col ><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sampleName }}</el-col>
+                </el-row>
+                <el-row style="font-size: 8px;width: 140px;">
+                  <el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�:&nbsp; </span>{{ item.item }}</el-col>
+                </el-row>
+                <el-row style="margin-top: 3px;font-size: 8px;">
+                  <el-col  style="display: flex;align-items: center;"><span>鏍峰搧鐘舵��:&nbsp;
+                  </span>
+                    <span style="white-space: nowrap;"><span v-if="item.insState==0">鈭�</span><span class="scor" v-if="item.insState!=0"></span>寰呮
+                    <span v-if="item.insState==1">鈭�</span><span class="scor" v-if="item.insState!=1"></span>鍦ㄦ
+                    <span v-if="item.insState==2">鈭�</span><span class="scor" v-if="item.insState!=2"></span>宸叉
+                    <span v-if="item.isLeave==1">鈭�</span><span class="scor" v-if="item.isLeave!=1"></span>鐣欐牱</span>
+                    <!-- <el-radio-group :value="item.insState" style="margin-top: 3px;margin-left: 1px;" disabled>
+                    <el-radio :label="0" style="margin-right: 3px;font-size: 6px;">寰呮</el-radio>
+                    <el-radio :label="1" style="margin-right: 3px;font-size: 6px;">鍦ㄦ</el-radio>
+                    <el-radio :label="2" style="margin-right: 3px;font-size: 6px;">宸叉</el-radio>
+                  </el-radio-group><el-radio :label="1" style="margin-top: 3px;font-size: 8px;" v-model="item.isLeave" disabled>鐣欐牱</el-radio> -->
+                </el-col>
+                </el-row>
+              </div>
+            </div>
+          </el-card>
+        </div>
+    </div>
 	</div>
 </template>
 
 <script>
 	import ValueTable from '../tool/value-table.vue'
 	import Add from '../do/b1-ins-order/add.vue'
-  import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
+  import vueQr from 'vue-qr'
+  import PrintJS from 'print-js'
 	export default {
 		components: {
 			ValueTable,
 			Add,
-      fiberOpticConfig
+      vueQr
 		},
 		data() {
 			return {
+        loadPint:false,
+        checkAll: false,
+        isIndeterminate: true,
+        printLoading:false,
+        printDialogVisible:false,
 				//鏄惁瀹℃牳閫氳繃  true鏄� false涓嶆槸
 				isPass: false,
 				//鏄惁瀹℃牳鎾ら攢  true鏄� false涓嶆槸
@@ -259,29 +461,31 @@
 					orderId: '',
 					sampleId: '',
 					appointed: '',
-					userId: ''
+					userId: '',
+          sonLaboratory:''
 				},
 				// 浜哄憳鍒楄〃
 				personList: [],
 				componentData: {
 					entity: {
 						entrustCode: null,
-						sampleType: null,
+						sample: null,
             sampleName: null,
             sampleModel: null,
             sampleCode: null,
 						state: 0,
-            value1:null,
-            value2:null,
-            value3:null,
+            name:null,
+            engineering:null,
+            production:null,
 						orderBy: {
 							field: 'id',
 							order: 'asc'
 						}
 					},
 					isIndex: true,
-					showSelect: false,
-					select: false,
+					showSelect: true,
+					select: true,
+          selectMethod:'selectMethod',
 					do: [{
 						id: 'dataLook',
 						font: '鏁版嵁鏌ョ湅',
@@ -323,7 +527,7 @@
 						}
 					}],
 					linkEvent: {
-						entrustCode: {
+						sampleName: {
 							method: 'selectAllByOne'
 						}
 					},
@@ -379,7 +583,8 @@
 					},
 					selectField: {},
 					requiredAdd: [],
-					requiredUp: []
+					requiredUp: [],
+          needSort: ['createTime', 'sendTime', 'type', 'appointed']
 				},
 				componentDataDataLook: {
 					entity: {
@@ -457,9 +662,28 @@
 				active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
 				currentId: null,
         more:false,
-        insOrderRow:{}
+        insOrderRow:{},
+        checkIndexList:[],
+        checkDataList:[
+          {
+            sampleCode:'11111'
+          }
+        ],
+        qrData:[],
+        multipleSelection:[],
+        sonLaboratoryList:[]
 			}
 		},
+    watch:{
+      printDialogVisible(newVal){
+        if(!newVal){
+          this.qrData = []
+          this.checkIndexList = []
+          this.checkDataList = []
+          this.isIndeterminate = true;
+        }
+      }
+    },
 		mounted() {
 			this.entityCopy = this.HaveJson(this.componentData.entity)
 			this.getPower()
@@ -469,6 +693,86 @@
       this.selectEnumByCategoryForOrderType()
 		},
 		methods: {
+      selectMethod(val){
+        this.multipleSelection = val
+      },
+      getLabelPrinting(selection){
+        this.loadPint = true;
+        this.$axios.post(this.$api.insOrder.labelPrinting,{
+          ids:selection.map(m=>m.id).join(',')
+        }).then(res => {
+          let arr = res.data;
+          arr.forEach(a=>{
+            this.loadPint = false;
+            let arr1 = []
+            a.insProduct.forEach(b=>{
+              arr1.push(b.inspectionItem)
+            })
+            a.item = [...new Set(arr1)].join(',')
+          })
+          this.qrData = arr
+          console.log(this.qrData)
+				})
+      },
+      //閫夋嫨瑕佹墦鍗扮殑浜岀淮鐮�
+      changePrintCode(){
+        let indexList = this.checkIndexList
+        let arr = []
+        indexList.forEach(i=>{
+          arr.push(this.qrData[i])
+        })
+        this.checkDataList = arr
+      },
+      //鍏ㄩ��
+      handleCheckAllChange(val) {
+        if(val){
+          for(var i=0;i<this.qrData.length;i++){
+            this.checkIndexList.push(i)
+          }
+          this.checkDataList = this.qrData
+        }else{
+          this.checkIndexList = []
+          this.checkDataList = []
+        }
+        this.isIndeterminate = false;
+      },
+      submitPrint(){
+        if(this.checkDataList.length < 1){
+          this.$message.warning("璇烽�夋嫨瑕佹墦鍗扮殑浜岀淮鐮�")
+          return
+        }
+        this.printDialogVisible = false;
+        PrintJS({
+            printable: 'printMOrder',//椤甸潰
+            type: "html",//鏂囨。绫诲瀷
+              maxWidth:360,
+              targetStyles:['*'],
+              style: `@page {
+                margin:0;
+                size: 360px 175px collapse;
+              }
+              html{
+                zoom:100%;
+              }
+              @media print{
+                width: 360px;
+                height: 175px;
+                margin:0;
+              }`,
+              onPrintDialogClose: this.erexcel=false,
+              targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+              font_size: '',
+        });
+      },
+      print(){
+        if(this.multipleSelection.length==0){
+            this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+            return
+        }
+        let selection = this.multipleSelection
+        this.getLabelPrinting(selection)
+        this.printDialogVisible = true
+      },
 			getAuthorizedPerson() {
 				this.$axios.get(this.$api.user.getUserMenu).then(res => {
 					let data = []
@@ -481,8 +785,8 @@
 					this.personList = data
 				})
 			},
-			refreshTable() {
-				this.$refs['ValueTable'].selectList()
+			refreshTable(e) {
+				this.$refs['ValueTable'].selectList(e)
 			},
 			refresh() {
 				this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -494,6 +798,8 @@
 				let up = false
 				let del = false
 				let add = false
+        let revoke = false
+        let check = false
 				for (var i = 0; i < power.length; i++) {
 					if (power[i].menuMethod == 'upInsOrder') {
 						up = true
@@ -501,10 +807,22 @@
 					if (power[i].menuMethod == 'addInsOrder') {
 						add = true
 					}
+          if (power[i].menuMethod == 'updateStatus') {
+          	revoke = true
+          }
+          if (power[i].menuMethod == 'upInsOrderOfState') {
+          	check = true
+          }
 				}
 				if (!up) {
 					this.componentData.do.splice(4, 1)
 				}
+        if (!revoke) {
+        	this.componentData.do.splice(3, 1)
+        }
+        if (!check) {
+        	this.componentData.do.splice(2, 1)
+        }
 				this.addPower = add
 			},
 			handleClose() {
@@ -571,14 +889,32 @@
 					this.distributeData.appointed = res.data
           this.distributeData.type = row.type
 				})
+        this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
+            orderId:row.id,
+          }).then(res => {
+					if (res.code === 200&&res.data.length>0) {
+            this.sonLaboratoryList = [];
+            res.data.forEach(m=>{
+              this.sonLaboratoryList.push({
+                value:m,
+                label:m
+              })
+            })
+					}
+				})
 			},
 			submitForm2() {
 				if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
 					this.$message.error('绾﹀畾鏃堕棿鏈~鍐�')
 					return
 				}
+        //
         if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
 					this.$message.error('鎸囨淳浜哄憳鏈~鍐�')
+					return
+				}
+        if(this.distributeData.userId&&(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory=='')){
+					this.$message.error('璇曢獙瀹ゆ湭濉啓')
 					return
 				}
 				this.upLoad = true;
@@ -586,7 +922,8 @@
 					orderId: this.distributeData.orderId,
 					sampleId: this.distributeData.sampleId,
 					appointed: this.distributeData.appointed,
-					userId: this.distributeData.userId
+					userId: this.distributeData.userId,
+          sonLaboratory:this.distributeData.sonLaboratory,
 				}).then(res => {
 					if (res.code === 201) {
 						this.upLoad = false
@@ -595,7 +932,7 @@
 					this.$message.success('淇敼鎴愬姛')
 					this.upLoad = false
 					this.issuedDialogVisible = false
-					this.refreshTable()
+					this.refreshTable('page')
 				}).catch(e => {
 					this.$message.error('淇敼澶辫触')
 					this.upLoad = false
@@ -608,7 +945,7 @@
             if (res.code===200){
               this.upLoad=false
               this.quashDialogVisible=false
-              this.refreshTable()
+              this.refreshTable('page')
               this.$message.success("鏇存柊鎴愬姛")
             }
           })
@@ -617,7 +954,7 @@
             if (res.code===200){
               this.upLoad = false
               this.quashDialogVisible = false
-              this.refreshTable()
+              this.refreshTable('page')
               this.$message.success("鏇存柊鎴愬姛")
             }
           })
@@ -632,6 +969,7 @@
 			// 涓嬪崟
 			playOrder(num) {
 				this.active = num
+        this.refreshTable('page')
 			},
 			handleTab(m, i) {
 				this.tabIndex = i;
@@ -676,6 +1014,14 @@
           this.componentData.tagField.orderType.select = res.data
         })
       },
+      getStyle(){
+        return 'height: calc(100% - '+(this.more?'94':'44')+'px)'
+      },
+      changeUser(){
+        if(this.sonLaboratoryList.length>0){
+          this.distributeData.sonLaboratory = this.sonLaboratoryList[0].value
+        }
+      }
 		}
 	}
 </script>

--
Gitblit v1.9.3