Browse Source

fix:修改数据层级结构

lupeng 4 months ago
parent
commit
6da817c35c

+ 21 - 4
src/views/pro/traceability/components/checkCom.vue

@@ -5,7 +5,7 @@
       ref="crudRef2"
       v-model:search="search"
       v-model="form"
-      :data="data"
+      :data="datas"
       :option="option"
       @row-update="updateRow"
       v-model:page="page"
@@ -61,19 +61,35 @@ const props =defineProps({
     required: true,
   },
 });
+const datas=ref([]);
 const refreshTra = (row) => {
   commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 };
 defineExpose({ refreshTra });
 const userStore = useUserStoreHook();
 onMounted(() => {
-  search.value.processId=props.processId;
   if(userStore.user.userId===10000){
     option.value.menu=true;
 
   }
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 });
 const doEdit = (row, index) => {
   crudRef2.value && crudRef2.value.rowEdit(row, index);
@@ -104,6 +120,7 @@ option.value = Object.assign(option.value, {
       label: "工序名称",
       prop: "opName",
       display: false,
+      hide: true,
     },
     {
       label: "点检项名称",

+ 23 - 6
src/views/pro/traceability/components/equitCom.vue

@@ -5,7 +5,7 @@
       ref="crudRef2"
       v-model:search="search"
       v-model="form"
-      :data="data"
+      :data="datas"
       :option="option"
       v-model:page="page"
       @row-update="updateRow"
@@ -77,7 +77,15 @@ const crudRef2 = ref(null); //crudRef.value 获取avue-crud对象
 const userStore = useUserStoreHook();
 const refreshTra = (row) => {
   commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 };
 const deviceDetail = ref({});
 const doEdit = (row, index) => {
@@ -96,15 +104,23 @@ const deviceInfo = (value) => {
 }
 defineExpose({ refreshTra });
 onMounted(() => {
-  search.value.processId=props.processId;
+
   if(userStore.user.userId===10000){
     option.value.menu=true;
 
   }
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
 
-});
+  );
 
+});
+const datas = ref([]);
 option.value = Object.assign(option.value, {
   selection: false,
   border: true,
@@ -130,7 +146,8 @@ option.value = Object.assign(option.value, {
     {
       label: "工序名称",
       prop: "opName",
-      display: false
+      display: false,
+      hide: true,
     },
     {
       label: "设备类型",

+ 29 - 4
src/views/pro/traceability/components/excelCom.vue

@@ -6,7 +6,7 @@
       v-model:search="search"
       v-model="form"
       @row-update="createRow"
-      :data="data"
+      :data="datas"
       :option="option"
       v-model:page="page"
     >
@@ -116,18 +116,42 @@ const doEdit = (row, index) => {
 };
 const refreshTra = (row) => {
   commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode}
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 };
 const refreshDatalist = () => {
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 };
+const datas=ref([]);
 defineExpose({ refreshTra });
 onMounted(() => {
   search.value.processId = props.processId;
   if (userStore.user.userId === 10000) {
     option.value.menu = true;
   }
-  dataList();
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 });
 
 option.value = Object.assign(option.value, {
@@ -158,6 +182,7 @@ option.value = Object.assign(option.value, {
       disabled: true,
       search: false,
       display: false,
+      hide: true,
     },
 
     {

+ 22 - 9
src/views/pro/traceability/components/materialsCom.vue

@@ -6,7 +6,7 @@
       v-model:search="search"
       v-model="form"
       @row-update="updateRow"
-      :data="data"
+      :data="datas"
       :option="option"
       v-model:page="page"
     >
@@ -43,6 +43,7 @@ import {
 // 数据字典相关
 const { dicts } = useDictionaryStore();
 const crudRef2 = ref({});
+const datas =ref([]);
 // 传入一个url,后面不带/
 const {
   form,
@@ -69,15 +70,31 @@ const doEdit = (row, index) => {
 };
 const refreshTra = (row) => {
   commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 };
 defineExpose({ refreshTra });
 onMounted(() => {
-  search.value.processId=props.processId;
+
   if (userStore.user.userId === 10000) {
     option.value.menu = true;
   }
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 });
 const props =defineProps({
   processId: {
@@ -112,11 +129,7 @@ option.value = Object.assign(option.value, {
       display: false,
       hide: true,
     },
-    {
-      label: "工序名称",
-      prop: "opName",
-      display: false,
-    },
+
 
     {
       label: "物料名称",

+ 1 - 6
src/views/pro/traceability/components/mediaCom.vue

@@ -94,6 +94,7 @@ onMounted(() => {
     option.value.editBtn = true;
   }
   dataList();
+
 });
 const props =defineProps({
   processId: {
@@ -120,12 +121,6 @@ option.value = Object.assign(option.value, {
   header: false,
   column: [
     {
-      label: "上传工序",
-      prop: "operationName",
-      search: false,
-      display: false,
-    },
-    {
       label: "上传人员",
       prop: "creator",
       span: 16,

+ 20 - 4
src/views/pro/traceability/components/recordCom.vue

@@ -5,7 +5,7 @@
       ref="crudRef2"
       v-model:search="search"
       v-model="form"
-      :data="data"
+      :data="datas"
       :option="option"
       @row-update="updateRow"
       v-model:page="page"
@@ -57,10 +57,18 @@ const { selectionChange, multipleDelete } = Methords; //选中和批量删除事
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
 
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
-
+const datas = ref([]);
 const refreshTra = (row) => {
   commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
-  dataList();
+  search.value.processId = props.processId;
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 };
 
 defineExpose({ refreshTra });
@@ -76,7 +84,14 @@ onMounted(() => {
   if (userStore.user.userId === 10000) {
     option.value.menu = true;
   }
-  dataList();
+  dataList().then(
+      ()=>{
+        if(data.value&&data.value.length>0){
+          datas.value=data.value[0].children;
+        }
+      }
+
+  );
 });
 const doEdit = (row, index) => {
   crudRef2.value && crudRef2.value.rowEdit(row, index);
@@ -107,6 +122,7 @@ option.value = Object.assign(option.value, {
       label: "工序名称",
       prop: "opName",
       display: false,
+      hide: true,
     },
     {
       label: "记录项名称",

+ 1 - 0
src/views/pro/traceability/components/testData.vue

@@ -100,6 +100,7 @@ onMounted(() => {
     option.value.editBtn = true;
   }
   dataList();
+  console.log(data.value);
 });
 
 option.value = Object.assign(option.value, {