|
@@ -220,14 +220,25 @@ const authBtnTabClick = (val) => {
|
|
|
}
|
|
|
|
|
|
//类型tab数据和相关处理
|
|
|
-
|
|
|
+const leftFormData=ref([])
|
|
|
+const rightFormData=ref([])
|
|
|
+const allFormData=ref([])
|
|
|
const tabTypeTab = ref([
|
|
|
{key:'1', name: '记录表'},
|
|
|
{key:'2', name: '报告单'},
|
|
|
]);
|
|
|
const tabTypeChange = ({key}) => {
|
|
|
+ console.log(key,'切换key');
|
|
|
+ console.log(ListItemRef.value?.getFormData(),'ListItemRef.value?.getFormData()');
|
|
|
tabTypeKey.value = key
|
|
|
- listItemBaseData.value.tableType = key
|
|
|
+ listItemBaseData.value.tableType=key
|
|
|
+ if(tabTypeKey.value==='2'){
|
|
|
+ leftFormData.value=ListItemRef.value?.getFormData()
|
|
|
+ }else{
|
|
|
+ rightFormData.value=ListItemRef.value?.getFormData()
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
getSearchNodeTables()
|
|
|
}
|
|
|
|
|
@@ -366,20 +377,36 @@ const seaElTreeProps = ref({
|
|
|
children: 'children'
|
|
|
})
|
|
|
const linksRelateSearchTreeVal = ref('')
|
|
|
-watch(linksRelateSearchTreeVal, (val) => {
|
|
|
- if(!val.length){
|
|
|
- nextTick(()=> {
|
|
|
- unmatchedTreeData.value =getStoreData('unmatchedTreeData');
|
|
|
+// watch(tabTypeKey, (val) => {
|
|
|
+// if(val){
|
|
|
+// console.log(val);
|
|
|
+// if (val==='1') {
|
|
|
+
|
|
|
+// leftFormData.value=ListItemRef.value?.getFormData()
|
|
|
+// }else{
|
|
|
+// rightFormData.value= ListItemRef.value?.getFormData()
|
|
|
+// }
|
|
|
+// }
|
|
|
+
|
|
|
+// },
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+// )
|
|
|
+// watch(linksRelateSearchTreeVal, (val) => {
|
|
|
+// if(!val.length){
|
|
|
+// nextTick(()=> {
|
|
|
+// unmatchedTreeData.value =getStoreData('unmatchedTreeData');
|
|
|
|
|
|
|
|
|
- })
|
|
|
- }
|
|
|
+// })
|
|
|
+// }
|
|
|
|
|
|
-},
|
|
|
+// },
|
|
|
|
|
|
-{immediate:true}
|
|
|
+// {immediate:true}
|
|
|
|
|
|
-)
|
|
|
+// )
|
|
|
const linksRelateTreeLoading = ref(false)
|
|
|
const searchTreeData = ref([])
|
|
|
const searchlinksRelateTreeLoading = ref(false)
|
|
@@ -625,19 +652,47 @@ const linksSampleModalClose = () => {
|
|
|
//保存
|
|
|
const tableFormSaveLoading = ref(false)
|
|
|
const tableFormSaveClick = async () => {
|
|
|
+ console.log(listItemBaseData.value,'.listItemBaseData.value');
|
|
|
if(checkrelationString.value.length>0){
|
|
|
listItemBaseData.value.projectPosition=checkrelationString.value
|
|
|
}
|
|
|
- console.log(listItemBaseData.value.detectionResult,'istItemBaseData.value.detectionResult');
|
|
|
if(tabTypeKey.value==='2'&&listItemBaseData.value.detectionResult===''){
|
|
|
window.$message?.warning('请选择是否合格')
|
|
|
}else{
|
|
|
- let FormData = ListItemRef.value?.getFormData()
|
|
|
+ // let FormData = ListItemRef.value?.getFormData()
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ let FormData
|
|
|
+ if(leftFormData.value===undefined||rightFormData.value===undefined){
|
|
|
+ FormData =ListItemRef.value?.getFormData()
|
|
|
+ listItemBaseData.value.tableType=tabTypeKey.value
|
|
|
+ }
|
|
|
+ else if(leftFormData.value?.length===0&&rightFormData.value?.length===0){
|
|
|
+ FormData =ListItemRef.value?.getFormData()
|
|
|
+ listItemBaseData.value.tableType=tabTypeKey.value
|
|
|
+ }
|
|
|
+ else if(leftFormData.value?.length>0&&tabTypeKey.value==='2'&&ListItemRef.value?.getFormData().length>0){
|
|
|
+ FormData = leftFormData.value?.concat(ListItemRef.value?.getFormData())
|
|
|
+ listItemBaseData.value.tableType='1,2'
|
|
|
+ }else if(rightFormData.value?.length>0&&tabTypeKey.value==='1'&&ListItemRef.value?.getFormData().length>0){
|
|
|
+ FormData = rightFormData.value?.concat(ListItemRef.value?.getFormData())
|
|
|
+ listItemBaseData.value.tableType='1,2'
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ FormData = leftFormData.value?.concat(rightFormData.value)
|
|
|
+ listItemBaseData.value.tableType='1,2'
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
let FormRegExpJson = ListItemRef.value?.getFormRegExpJson()
|
|
|
+ console.log(getObjNullValue(FormRegExpJson),'getObjNullValue(FormRegExpJson)');
|
|
|
+ console.log(FormData.length,'getObjNullValue(FormRegExpJson)');
|
|
|
//效验数据
|
|
|
- if (getObjNullValue(FormRegExpJson)) {
|
|
|
- setFormRegExpJson(FormRegExpJson)
|
|
|
- } else if (FormData.length > 0) {
|
|
|
+
|
|
|
+ if (FormData.length > 0) {
|
|
|
tableFormSaveLoading.value = true
|
|
|
const {error, code,data} = await dataApi.saveExcelBussData({
|
|
|
...listItemBaseData.value,
|
|
@@ -645,7 +700,7 @@ const tableFormSaveClick = async () => {
|
|
|
dataInfo: {orderList: FormData},
|
|
|
// deviceUseIds:listDeviceUseIds.value
|
|
|
})
|
|
|
- console.log(data,'data');
|
|
|
+
|
|
|
nodeIdvalue.value=data
|
|
|
tableFormSaveLoading.value = false
|
|
|
if (!error && code === 200) {
|