diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 5c357d3..9e313f8 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -36,12 +36,14 @@
@click="showPopup2"
/>
+
+
+
+
+
@@ -140,6 +150,7 @@ import {uploadFile} from "../../util/fileUpload";
//用户筛选弹窗
import Popup from './userFilter.vue';
import {getDict} from "../../api/Home";
+import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage";
const { useMy } = $globalStore
@@ -158,9 +169,13 @@ const data = reactive({
popupVisible2: false,
popupContent2: '',
+
showGA:false,
+ showItem:false,
lawEnforcementBasisText:"",
+ lawEnforcementItemText: "",
ga_columns: [],
+ item_columns: [],
});
//保存参数
const submitData = reactive({
@@ -204,6 +219,42 @@ const tapBad = () => {
data.bad = "#7FFFD4";
submitData.reslut = 1;
}
+
+const getLinkageByValueAndParentId = (value, parentId) => {
+ // 查询检查要求字典信息
+ queryLinkageDictByValueAndParentId({"value":value, "parentId": parentId}, success => {
+ getLinkageByParentIdToItem(success.id)
+ },error=>{});
+}
+
+const getLinkageByParentIdToItem = (parentId) => {
+ // 查询检查要求字典信息
+ queryLinkage({"parentId": parentId}, success => {
+ for(var i=0; i{});
+}
+
+const getLinkageByParentIdToGA = (parentId) => {
+ // 查询检查要求字典信息
+ data.ga_columns = [];
+ queryLinkage({"parentId": parentId}, success => {
+ for(var i=0; i{});
+}
+
//3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
//初始化参数,获取扫码的企业统一信用编码
onMounted(() =>{
@@ -228,12 +279,7 @@ onMounted(() =>{
})
- // 查询检查要求字典信息
- getDict({"dictType": "lawEnforcementBasis"}, success => {
- for(var i=0; i{});
+ getLinkageByValueAndParentId("law_item", "100");
})
// 返回
@@ -264,18 +310,29 @@ const deleteFile = (file,index) =>{
return true;
}
-/* 执法依据 start */
+/* 检查要求 start */
const gaConfirm = ({ selectedOptions }) => {
data.lawEnforcementBasisText = selectedOptions[0].text;
submitData.lawEnforcementBasis = selectedOptions[0].value;
data.showGA = false;
+ data.showItem = false;
};
-const gaChange = ({ selectedValues }) => {
+
+/* 检查要求 start */
+const itemConfirm = ({ selectedOptions }) => {
+ data.lawEnforcementItemText = selectedOptions[0].text;
+ submitData.lawEnforcementItem = selectedOptions[0].value;
+ data.showGA = false;
+ data.showItem = false;
};
+const itemChange =({ selectedOptions }) => {
+ getLinkageByParentIdToGA(selectedOptions[0].id);
+}
const gaCancel = () => {
data.showGA = false;
+ data.showItem = false;
}
-/* 执法依据 end */
+/* 检查要求 end */
const submit = () =>{
addEnforcementRegistration(submitData,success =>{
diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue
index c5bc7ca..c011d58 100644
--- a/src/views/enterprise/registrationDetail.vue
+++ b/src/views/enterprise/registrationDetail.vue
@@ -140,6 +140,7 @@ import {queryEnforcementRegistrationById, getAttr} from '../../api/enforce'
import { reactive, ref } from "vue";
import {uploadFile} from "../../util/fileUpload";
import {getDict} from "../../api/Home";
+import {queryLinkageById} from "../../api/linkage";
//用户筛选弹窗
// import Popup from './userFilter.vue';
@@ -209,15 +210,14 @@ const imagePreview = (index) =>{
});
}
-const setDict = () =>{
- // 查询检查要求字典信息
- getDict({"dictType": "lawEnforcementBasis"}, success => {
- for(var i=0; i {
+ queryLinkageById({"id": id}, success => {
+ submitData.lawEnforcementItem = success.title
+ },error=>{});
+}
+const setLinkageGA = (id) => {
+ queryLinkageById({"id": id}, success => {
+ submitData.lawEnforcementBasis = success.title
},error=>{});
}
@@ -257,7 +257,8 @@ onMounted(() =>{
data.bad = "#7FFFD4";
}
- setDict();
+ setLinkageItem(submitData.lawEnforcementItem);
+ setLinkageGA(submitData.lawEnforcementBasis);
},error=>{
})