3 Commits f5fd23b975 ... c304dd4580

Author SHA1 Message Date
  wzq c304dd4580 Merge branch 'dev-2.19.0' into dev 4 months ago
  wzq fbf3c98fe1 Merge branch 'dev-2.19.0' of http://101.36.160.140:21044/province-vue-qh/province-vue-all into dev-2.19.0 4 months ago
  wzq eb71621016 flx:更改990 4 months ago

+ 14 - 2
src/views/basic.info/ARlocation/ARlocationDel.vue

@@ -155,7 +155,7 @@
155
 							name="produceArea"
155
 							name="produceArea"
156
 							:label-col="{ span: 10 }"
156
 							:label-col="{ span: 10 }"
157
 						>
157
 						>
158
-							<a-input placeholder="请输入" disabled v-model:value="tableList.produceArea" />
158
+							<a-input placeholder="请输入" disabled :value="cocName(tableList.produceArea)" />
159
 						</a-form-item>
159
 						</a-form-item>
160
 					</a-col>
160
 					</a-col>
161
 				</a-row>
161
 				</a-row>
@@ -256,7 +256,7 @@
256
 							:label-col="{ span: 10 }"
256
 							:label-col="{ span: 10 }"
257
 							:rules="[{ required: true, message: '请输入!' }]"
257
 							:rules="[{ required: true, message: '请输入!' }]"
258
 						>
258
 						>
259
-							<a-input disabled placeholder="请输入" v-model:value="tableList.zblbArr" />
259
+							<a-input disabled placeholder="请输入" :value="getlass(tableList.zblb)" />
260
 						</a-form-item>
260
 						</a-form-item>
261
 					</a-col>
261
 					</a-col>
262
 					<a-col :span="8">
262
 					<a-col :span="8">
@@ -429,6 +429,18 @@
429
 		cocDLMXS,
429
 		cocDLMXS,
430
 		cocBUG_INSPECTION_TYPE
430
 		cocBUG_INSPECTION_TYPE
431
 	} = enumMap()
431
 	} = enumMap()
432
+	const getlass = (v) => {
433
+		if (v && v.split) {
434
+			let a = v.split(',') || []
435
+			let b = a.map((item) => {
436
+				return cocName(+item)
437
+			})
438
+			return b.join(',')
439
+		} else {
440
+			return v
441
+		}
442
+	}
443
+
432
 	const formRef = ref(null)
444
 	const formRef = ref(null)
433
 	const router = useRouter()
445
 	const router = useRouter()
434
 	const route = useRoute()
446
 	const route = useRoute()

+ 15 - 2
src/views/rotation/planReceive/tables.vue

@@ -155,7 +155,7 @@
155
 							name="produceArea"
155
 							name="produceArea"
156
 							:label-col="{ span: 10 }"
156
 							:label-col="{ span: 10 }"
157
 						>
157
 						>
158
-							<a-input placeholder="请输入" disabled v-model:value="tableList.produceArea" />
158
+							<a-input placeholder="请输入" disabled :value="cocName(tableList.produceArea)" />
159
 						</a-form-item>
159
 						</a-form-item>
160
 					</a-col>
160
 					</a-col>
161
 				</a-row>
161
 				</a-row>
@@ -256,7 +256,8 @@
256
 							:label-col="{ span: 10 }"
256
 							:label-col="{ span: 10 }"
257
 							:rules="[{ required: true, message: '请输入!' }]"
257
 							:rules="[{ required: true, message: '请输入!' }]"
258
 						>
258
 						>
259
-							<a-input disabled placeholder="请输入" v-model:value="tableList.zblbArr" />
259
+							<!-- zblbArr -->
260
+							<a-input disabled placeholder="请输入" :value="getlass(tableList.zblb)" />
260
 						</a-form-item>
261
 						</a-form-item>
261
 					</a-col>
262
 					</a-col>
262
 					<a-col :span="8">
263
 					<a-col :span="8">
@@ -429,6 +430,18 @@
429
 		cocDLMXS,
430
 		cocDLMXS,
430
 		cocBUG_INSPECTION_TYPE
431
 		cocBUG_INSPECTION_TYPE
431
 	} = enumMap()
432
 	} = enumMap()
433
+	const getlass = (v) => {
434
+		if (v && v.split) {
435
+			let a = v.split(',') || []
436
+			let b = a.map((item) => {
437
+				return cocName(+item)
438
+			})
439
+			return b.join(',')
440
+		} else {
441
+			return v
442
+		}
443
+	}
444
+
432
 	const formRef = ref(null)
445
 	const formRef = ref(null)
433
 	const router = useRouter()
446
 	const router = useRouter()
434
 	const route = useRoute()
447
 	const route = useRoute()

+ 15 - 2
src/views/security/Unified/tables.vue

@@ -155,7 +155,7 @@
155
 							name="produceArea"
155
 							name="produceArea"
156
 							:label-col="{ span: 10 }"
156
 							:label-col="{ span: 10 }"
157
 						>
157
 						>
158
-							<a-input placeholder="请输入" disabled v-model:value="tableList.produceArea" />
158
+							<a-input placeholder="请输入" disabled :value="cocName(tableList.produceArea)" />
159
 						</a-form-item>
159
 						</a-form-item>
160
 					</a-col>
160
 					</a-col>
161
 				</a-row>
161
 				</a-row>
@@ -256,7 +256,7 @@
256
 							:label-col="{ span: 10 }"
256
 							:label-col="{ span: 10 }"
257
 							:rules="[{ required: true, message: '请输入!' }]"
257
 							:rules="[{ required: true, message: '请输入!' }]"
258
 						>
258
 						>
259
-							<a-input disabled placeholder="请输入" v-model:value="tableList.zblbArr" />
259
+							<a-input disabled placeholder="请输入" :value="getlass(tableList.zblb)" />
260
 						</a-form-item>
260
 						</a-form-item>
261
 					</a-col>
261
 					</a-col>
262
 					<a-col :span="8">
262
 					<a-col :span="8">
@@ -429,6 +429,19 @@
429
 		cocDLMXS,
429
 		cocDLMXS,
430
 		cocBUG_INSPECTION_TYPE
430
 		cocBUG_INSPECTION_TYPE
431
 	} = enumMap()
431
 	} = enumMap()
432
+
433
+	const getlass = (v) => {
434
+		if (v && v.split) {
435
+			let a = v.split(',') || []
436
+			let b = a.map((item) => {
437
+				return cocName(+item)
438
+			})
439
+			return b.join(',')
440
+		} else {
441
+			return v
442
+		}
443
+	}
444
+
432
 	const formRef = ref(null)
445
 	const formRef = ref(null)
433
 	const router = useRouter()
446
 	const router = useRouter()
434
 	const route = useRoute()
447
 	const route = useRoute()