YangJian0701 1 an în urmă
părinte
comite
0303055367

BIN
dist.rar → 2.0线上.rar


+ 12 - 3
src/views/ValidationTemplate/index.vue

@@ -154,7 +154,7 @@
 										<el-input v-model="form.T_name" autocomplete="off"></el-input>
 									</el-form-item>
 									<el-form-item label="排序" label-width="80px">
-										<el-input v-model="form.T_sort" autocomplete="off"></el-input>
+										<el-input v-model="form.T_sort" autocomplete="off" @input="form.T_flow_sort = form.T_sort"></el-input>
 									</el-form-item>
 									<el-form-item label="描述" label-width="80px" v-if="['0','1','2','7','9','12','13'].includes(form.T_label)">
 										<el-input type="textarea" v-model="form.T_text"></el-input>
@@ -261,6 +261,7 @@
 		components:{files,yfile},
 		filters:{
 			lableData(e){
+				console.log('筛选',e,arrLabel)
 				const resIt = arrLabel.find(item=>{
 					return item.label == e
 				})
@@ -437,13 +438,15 @@
 				this.innerDrawer2 = true
 				if(differ=='edit'){//编辑
 					this.titles = '编辑标签'
-					console.log('标签',e)
+					console.log('标签',e,this.form.T_sort)
 					Object.keys(this.form).forEach(key => {
 						if(key=='T_source' || key=='T_label'){
 							this.form[key] = JSON.stringify(e[key])
 						}else{
 							this.form[key] = e[key]
 						}
+						// if(this.form.T_flow_sort ==0){this.form.T_flow_sort = -1}
+						 
 					})
 					console.log('标签',this.form)
 				}else{//添加
@@ -451,6 +454,7 @@
 					Object.keys(this.form).forEach(key => {
 						this.form[key] = ''
 					})
+					this.form.T_flow_sort = -1
 				}
 				this.form.T_VerifyTemplate_id = this.pages2.T_VerifyTemplate_id
 				console.log('显示',this.form)
@@ -543,8 +547,13 @@
 			getmapListApi(){
 				Map_List(this.pages2).then(res => {
 					console.log('标签列表1111', res)
+					const arr = []
+					const arr1 = res.data.Data.List || []
 					if (res.data.Code === 200) {
-						this.tagTableData = res.data.Data.List
+						arr1.forEach(item=>{
+							item.T_label!=0&&arr.push(item)
+						})
+						this.tagTableData = arr
 					}
 				})
 			},

+ 2 - 4
src/views/calibrationCertificate/index.vue

@@ -14,8 +14,7 @@
 		</div>
 		<div class="calibrationCertificate2">
 			<el-table :data="tableData" border size="small">
-				
-				<!-- <el-table-column  prop="T_layout_no" width="180">
+				<el-table-column  prop="T_layout_no" width="180">
 					<template #header>
 						<div style="display: flex;align-items: center;cursor: pointer;" @click="filtFun('layout')">
 							布局编号
@@ -25,8 +24,7 @@
 							</div>
 						</div>
 					</template>
-				</el-table-column> -->
-				
+				</el-table-column>
 				<el-table-column label="证书编号" width="180">
 					<template slot-scope="scope">
 						<span>{{ scope.row.T_sn }}</span>