Merge branch 'dev-2.19.0' into dev

* dev-2.19.0:
  flx:更改990

src/views/basic.info/ARlocation/ARlocationDel.vue

@@ -155,7 +155,7 @@
 							name="produceArea"
 							:label-col="{ span: 10 }"
 						>
-							<a-input placeholder="请输入" disabled v-model:value="tableList.produceArea" />
+							<a-input placeholder="请输入" disabled :value="cocName(tableList.produceArea)" />
 						</a-form-item>
 					</a-col>
 				</a-row>
@@ -256,7 +256,7 @@
 							:label-col="{ span: 10 }"
 							:rules="[{ required: true, message: '请输入!' }]"
 						>
-							<a-input disabled placeholder="请输入" v-model:value="tableList.zblbArr" />
+							<a-input disabled placeholder="请输入" :value="getlass(tableList.zblb)" />
 						</a-form-item>
 					</a-col>
 					<a-col :span="8">
@@ -429,6 +429,18 @@
 		cocDLMXS,
 		cocBUG_INSPECTION_TYPE
 	} = enumMap()
+	const getlass = (v) => {
+		if (v && v.split) {
+			let a = v.split(',') || []
+			let b = a.map((item) => {
+				return cocName(+item)
+			})
+			return b.join(',')
+		} else {
+			return v
+		}
+	}
+
 	const formRef = ref(null)
 	const router = useRouter()
 	const route = useRoute()

src/views/rotation/planReceive/tables.vue

@@ -155,7 +155,7 @@
 							name="produceArea"
 							:label-col="{ span: 10 }"
 						>
-							<a-input placeholder="请输入" disabled v-model:value="tableList.produceArea" />
+							<a-input placeholder="请输入" disabled :value="cocName(tableList.produceArea)" />
 						</a-form-item>
 					</a-col>
 				</a-row>
@@ -256,7 +256,8 @@
 							:label-col="{ span: 10 }"
 							:rules="[{ required: true, message: '请输入!' }]"
 						>
-							<a-input disabled placeholder="请输入" v-model:value="tableList.zblbArr" />
+							<!-- zblbArr -->
+							<a-input disabled placeholder="请输入" :value="getlass(tableList.zblb)" />
 						</a-form-item>
 					</a-col>
 					<a-col :span="8">
@@ -429,6 +430,18 @@
 		cocDLMXS,
 		cocBUG_INSPECTION_TYPE
 	} = enumMap()
+	const getlass = (v) => {
+		if (v && v.split) {
+			let a = v.split(',') || []
+			let b = a.map((item) => {
+				return cocName(+item)
+			})
+			return b.join(',')
+		} else {
+			return v
+		}
+	}
+
 	const formRef = ref(null)
 	const router = useRouter()
 	const route = useRoute()

src/views/security/Unified/tables.vue

@@ -155,7 +155,7 @@
 							name="produceArea"
 							:label-col="{ span: 10 }"
 						>
-							<a-input placeholder="请输入" disabled v-model:value="tableList.produceArea" />
+							<a-input placeholder="请输入" disabled :value="cocName(tableList.produceArea)" />
 						</a-form-item>
 					</a-col>
 				</a-row>
@@ -256,7 +256,7 @@
 							:label-col="{ span: 10 }"
 							:rules="[{ required: true, message: '请输入!' }]"
 						>
-							<a-input disabled placeholder="请输入" v-model:value="tableList.zblbArr" />
+							<a-input disabled placeholder="请输入" :value="getlass(tableList.zblb)" />
 						</a-form-item>
 					</a-col>
 					<a-col :span="8">
@@ -429,6 +429,19 @@
 		cocDLMXS,
 		cocBUG_INSPECTION_TYPE
 	} = enumMap()
+
+	const getlass = (v) => {
+		if (v && v.split) {
+			let a = v.split(',') || []
+			let b = a.map((item) => {
+				return cocName(+item)
+			})
+			return b.join(',')
+		} else {
+			return v
+		}
+	}
+
 	const formRef = ref(null)
 	const router = useRouter()
 	const route = useRoute()