Browse Source

fix:打包问题

luoxiao 1 month ago
parent
commit
7fa7231051

+ 89 - 107
src/views/base/craftManagement/route/components/bottomTable.vue

@@ -17,7 +17,6 @@
       @size-change="dataList"
       @current-change="dataList"
     >
-
       <template #filePath-form="scope">
         <!-- <single-upload v-model="form.filePath" />
         <FilesUpload v-model:src="form.filePath" v-model:src-list="form.filePath" /> -->
@@ -29,7 +28,11 @@
           <!--            :show-pdf-number="form.showAppointPageNum"-->
           <!--            :pdf-source="pdfPath"-->
           <!--          />-->
-          <el-button link type="primary" @click="toShowPDF(pdfPath,form.showAppointPageNum)">
+          <el-button
+            link
+            type="primary"
+            @click="toShowPDF(pdfPath, form.showAppointPageNum)"
+          >
             预览
           </el-button>
         </div>
@@ -42,17 +45,19 @@
         <!--          :is-link="true"-->
         <!--          :pdf-source="getSOAPpdf(row)"-->
         <!--        />-->
-        <el-button link type="primary" @click="toShowPDF(row.filePath,1)">
+        <el-button link type="primary" @click="toShowPDF(row.filePath, 1)">
           查看PDF
         </el-button>
       </template>
 
-
       <template #menu="{ row, index, type }">
-        <el-button @click="deleteGroup(row.id)" text type="primary" v-if="props.isTree=='1'&&props.groupId"
-        >删除
-        </el-button
-        >
+        <el-button
+          @click="deleteGroup(row.id)"
+          text
+          type="primary"
+          v-if="props.isTree == '1' && props.groupId"
+          >删除
+        </el-button>
       </template>
     </avue-crud>
     <CommonTable
@@ -62,9 +67,9 @@
       :multipleRow="true"
       @selected-sure="onSelectedFinish"
     />
-    <el-dialog v-model="dialogVisible">
-      <VuePdfEmbed :source="previewImgUrl" annotation-layer text-layer/>
-    </el-dialog>
+    <!-- <el-dialog v-model="dialogVisible">
+      <VuePdfEmbed :source="previewImgUrl" annotation-layer text-layer />
+    </el-dialog> -->
 
     <el-dialog v-model="versionDV" title="请先选择版本号" width="500" center>
       <el-select
@@ -92,11 +97,9 @@
   </div>
 </template>
 <script setup>
-import {ref, getCurrentInstance} from "vue";
-import {useCrud} from "@/hooks/userCrud";
-import {getTableConfig} from "./configs";
-import PDFView from "@/components/PDFView/index.vue";
-import VuePdfEmbed from "vue-pdf-embed";
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { getTableConfig } from "./configs";
 import {
   saveCompoents,
   getBomVersion,
@@ -108,7 +111,7 @@ import {
   treeDataAddBatch,
   removeGroup,
   removeAccessoryGroup,
-  treeAccessoryAddBatch
+  treeAccessoryAddBatch,
 } from "@/api/craft/process/index";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 
@@ -138,15 +141,15 @@ const afterDataListToGetBomVersion = () => {
   toGetBomVersion();
 };
 // 传入一个url,后面不带/
-const {url, form, data, option, search, page, toDeleteIds, Methords, Utils} =
+const { url, form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: tableConfig[props.tableType].url,
     afterDataList: afterDataListToGetBomVersion,
   });
 
-const {dataList, createRow, updateRow, deleteRow, searchChange, resetChange} =
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
-const {selectionChange, multipleUpdate} = Methords; //选中和批量删除事件
+const { selectionChange, multipleUpdate } = Methords; //选中和批量删除事件
 
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const bomVersion = ref(null);
@@ -185,46 +188,41 @@ const goToSelectMaterial = () => {
   versionDV.value = false;
 };
 const deleteGroupId = ref({});
-const deleteGroup = (id) =>{
+const deleteGroup = (id) => {
   deleteGroupId.value.id = id;
-  if(props.tableType === "wuliaocaiji"){
-    removeGroup(deleteGroupId.value).then(
-      (data)=>{
-        if(data.code==='200'){
-          ElMessage({
-            message: data.msg,
-            type: "success",
-          });
-          search.value.itemGroupId = props.groupId
-          dataList();
-        }
+  if (props.tableType === "wuliaocaiji") {
+    removeGroup(deleteGroupId.value).then((data) => {
+      if (data.code === "200") {
+        ElMessage({
+          message: data.msg,
+          type: "success",
+        });
+        search.value.itemGroupId = props.groupId;
+        dataList();
       }
-    )
+    });
   }
 
-  if(props.tableType === "fuliaoCJ"){
-    removeAccessoryGroup(deleteGroupId.value).then(
-      (data)=>{
-        if(data.code==='200'){
-          ElMessage({
-            message: data.msg,
-            type: "success",
-          });
-          search.value.itemGroupId = props.groupId
-          dataList();
-        }
+  if (props.tableType === "fuliaoCJ") {
+    removeAccessoryGroup(deleteGroupId.value).then((data) => {
+      if (data.code === "200") {
+        ElMessage({
+          message: data.msg,
+          type: "success",
+        });
+        search.value.itemGroupId = props.groupId;
+        dataList();
       }
-    )
+    });
   }
-
-}
+};
 const startCreat = () => {
   if (props.tableType === "wuliaocaiji") {
     if (bomVersion.value) {
       selectedVersion.value = bomVersion.value;
       goToSelectMaterial();
     } else {
-      getBomVersion({materialCode: route.fullPath.split("/")[5]}).then(
+      getBomVersion({ materialCode: route.fullPath.split("/")[5] }).then(
         (res) => {
           versionList.value = res?.data ?? [];
           versionDV.value = true;
@@ -276,7 +274,7 @@ const startCreat = () => {
     commonTableType.value = "OP_CHECK";
     nextTick(() => {
       commonTableRef.value?.startSelect({
-        operationId: route.params.id
+        operationId: route.params.id,
       });
       commonTableRef.value?.mergeOption({
         selection: true,
@@ -284,7 +282,6 @@ const startCreat = () => {
         header: false,
         selectable: function (row, index) {
           return row.isSelect;
-
         },
       });
     });
@@ -334,7 +331,7 @@ const groupCreat = () => {
 
     nextTick(() => {
       commonTableRef.value?.startSelect({
-        operationId: route.fullPath.split("/")[4] //查询工序下选择的物料)
+        operationId: route.fullPath.split("/")[4], //查询工序下选择的物料)
       });
       commonTableRef.value?.mergeOption({
         selection: true,
@@ -344,12 +341,11 @@ const groupCreat = () => {
   }
 };
 
-
 const saveSortData = async () => {
   multipleUpdate();
 };
 
-defineExpose({startCreat, saveSortData, groupCreat});
+defineExpose({ startCreat, saveSortData, groupCreat });
 
 const onSortChange = () => {
   data.value.forEach((item) => {
@@ -389,55 +385,43 @@ const onSelectedFinish = (itemValue) => {
       ElMessage.error("未选择分组信息!");
       return;
     }
-    itemValue?.forEach(
-      (item,index)=>{
-        const groupItem =  ref({});
-        groupItem.value.id = item.id;
-        groupItem.value.itemGroupId = itemGroup.value;
-        itemGroupList.value.push(groupItem.value);
-      }
-    )
-    treeDataAddBatch(itemGroupList.value).then(
-      (data)=>{
-        ElMessage({
-          message: data.msg,
-          type: "success",
-        });
-        search.value.itemGroupId = props.groupId
-        dataList();
-      }
-
-    )
+    itemValue?.forEach((item, index) => {
+      const groupItem = ref({});
+      groupItem.value.id = item.id;
+      groupItem.value.itemGroupId = itemGroup.value;
+      itemGroupList.value.push(groupItem.value);
+    });
+    treeDataAddBatch(itemGroupList.value).then((data) => {
+      ElMessage({
+        message: data.msg,
+        type: "success",
+      });
+      search.value.itemGroupId = props.groupId;
+      dataList();
+    });
     return;
   }
 
   //辅料分组保存
   if (commonTableType.value === "OP_ACCESSORY") {
-
-
     if (!itemGroup.value) {
       ElMessage.error("未选择分组信息!");
     }
 
-    itemValue?.forEach(
-      (item,index)=>{
-        const groupItem =  ref({});
-        groupItem.value.id = item.id;
-        groupItem.value.itemGroupId = itemGroup.value;
-        itemGroupList.value.push(groupItem.value);
-      }
-    )
-    treeAccessoryAddBatch(itemGroupList.value).then(
-      (data)=>{
-        ElMessage({
-          message: data.msg,
-          type: "success",
-        });
-        search.value.itemGroupId = props.groupId
-        dataList();
-      }
-
-    )
+    itemValue?.forEach((item, index) => {
+      const groupItem = ref({});
+      groupItem.value.id = item.id;
+      groupItem.value.itemGroupId = itemGroup.value;
+      itemGroupList.value.push(groupItem.value);
+    });
+    treeAccessoryAddBatch(itemGroupList.value).then((data) => {
+      ElMessage({
+        message: data.msg,
+        type: "success",
+      });
+      search.value.itemGroupId = props.groupId;
+      dataList();
+    });
     return;
   }
   if (props.tableType === "wuliaocaiji") {
@@ -561,16 +545,15 @@ const onSelectedFinish = (itemValue) => {
       }
     });
   }
-
 };
 const itemGroup = ref(null);
 const previewImgUrl = ref("");
-const dialogVisible = ref(false);
-const imgUrlClick = (itemValue) => {
-  previewImgUrl.value =
-    import.meta.env.VITE_APP_UPLOAD_URL + itemValue.filePath;
-  dialogVisible.value = true;
-};
+// const dialogVisible = ref(false);
+// const imgUrlClick = (itemValue) => {
+//   previewImgUrl.value =
+//     import.meta.env.VITE_APP_UPLOAD_URL + itemValue.filePath;
+//   dialogVisible.value = true;
+// };
 const getSOAPpdf = (itemValue) => {
   return import.meta.env.VITE_APP_UPLOAD_URL + itemValue.filePath;
 };
@@ -582,10 +565,10 @@ onMounted(() => {
   search.value.isTree = props.isTree;
   if (props.groupId) {
     search.value.itemGroupId = props.groupId;
-    itemGroup.value=props.groupId;
+    itemGroup.value = props.groupId;
   }
   //物料双规格分组的话没有编辑,删除要自定义
-  if (props.isTree === '1') {
+  if (props.isTree === "1") {
     option.value = Object.assign(option.value, {
       searchEnter: true,
       addBtn: false,
@@ -607,7 +590,6 @@ onMounted(() => {
     });
   }
 
-
   dataList();
   toGetBomVersion();
 });
@@ -643,9 +625,9 @@ watch(
       sortable: true,
       column: tableConfig[props.tableType].column,
     });
-    search.value.itemGroupId = props.groupId
-    itemGroup.value = props.groupId
-    console.log("aaaa",itemGroup.value);
+    search.value.itemGroupId = props.groupId;
+    itemGroup.value = props.groupId;
+    console.log("aaaa", itemGroup.value);
     dataList();
   }
 );
@@ -653,7 +635,7 @@ watch(
 const toGetBomVersion = () => {
   getRouteMaxVersion(
     route.fullPath.split("/")[6] ? route.fullPath.split("/")[6] : routeId.value
-  ).then(({data}) => {
+  ).then(({ data }) => {
     bomVersion.value = data;
   });
 };

+ 1 - 10
src/views/base/document/index.vue

@@ -61,7 +61,6 @@ import { useCrud } from "@/hooks/userCrud";
 import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import { updateDrawaing } from "@/api/drawing";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import PDFView from "@/components/PDFView/index.vue";
 import { syncPdmFiles } from "@/api/document/index.ts";
 
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
@@ -89,15 +88,7 @@ const testFiles = () => {
   form.value.filePath = pdfUrlList.value[0];
 };
 const PDFDrawerViewRef = ref(null);
-const toShowPDF = (row) => {
-  let url = '';
-  if (row.sourceType == 1) {
-    url = url + row.pdfPath;
-  } else if (row.sourceType == 2) {
-    url = url + filePath + row.filePath;
-  }
-  PDFDrawerViewRef.value && PDFDrawerViewRef.value.showPdf(url);
-};
+const toShowPDF = (row) => {};
 const filePath = import.meta.env.VITE_APP_UPLOAD_URL;
 const test = () => {
   isShowTable.value = true;

+ 0 - 1
src/views/base/excel/result/index.vue

@@ -73,7 +73,6 @@ import { useCrud } from "@/hooks/userCrud";
 import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import { updateDrawaing } from "@/api/drawing";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import PDFView from "@/components/PDFView/index.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 // 数据字典相关
 const { dicts } = useDictionaryStore();

+ 0 - 1
src/views/base/information/index.vue

@@ -103,7 +103,6 @@ import { useCrud } from "@/hooks/userCrud";
 import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import { updateDrawaing } from "@/api/drawing";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import PDFView from "@/components/PDFView/index.vue";
 import { checkPerm } from "@/directive/permission";
 import buttonPermission from "@/common/configs/buttonPermission";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());

+ 0 - 1
src/views/base/signature/index.vue

@@ -87,7 +87,6 @@ import Logo from "@/assets/logo.png";
 import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import { updateSignature } from "@/api/signature";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import PDFView from "@/components/PDFView/index.vue";
 import OpSignature from "./components/opSignature.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 // 数据字典相关

+ 2 - 3
src/views/demo/hooksDemo.vue

@@ -80,7 +80,7 @@
       @finished="testFiles"
     />
     <el-button @click="testFiles">测试上传文件的值</el-button>
-    <div style="height: 100px; width: 100px; overflow: hidden">
+    <!-- <div style="height: 100px; width: 100px; overflow: hidden">
       <PDFView
         :need-to-show-pdf="true"
         content-type="button"
@@ -88,7 +88,7 @@
         :show-pdf-number="3"
         pdf-source="http://192.168.101.4:9000/jgfile/2024/04/20/%E7%AC%AC08%E7%AB%A0_%E8%81%9A%E5%90%88%E5%87%BD%E6%95%B0.pdf"
       />
-    </div>
+    </div> -->
   </div>
 </template>
 <script setup>
@@ -98,7 +98,6 @@ import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
 import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
-import PDFView from "@/components/PDFView/index.vue";
 // 测试上传文件相关
 const fileUrl = ref(""); //单文件
 const fileUrlList = ref([]); //多文件

+ 10 - 8
src/views/device/metering/index.vue

@@ -36,13 +36,9 @@
           v-if="radio1 == '1'"
           >计量</el-button
         >
-        <PDFView
-          :need-to-show-pdf="true"
-          content-type="button"
-          :is-link="true"
-          :pdf-source="filePath + row.pdfPath"
-          v-if="radio1 == '2' && row.pdfPath != ''"
-        />
+        <el-button link type="primary" @click="toShowPDF(row)">
+          预览
+        </el-button>
         <el-button
           @click="maintenance1(row)"
           icon="el-icon-setting"
@@ -282,6 +278,7 @@
     >
       <record-page :maintenanceId="maintenanceInfo.id" />
     </el-dialog>
+    <PDFDrawerView ref="PDFDrawerViewRef"></PDFDrawerView>
   </div>
 </template>
 <script setup>
@@ -298,7 +295,6 @@ import {
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import RecordPage from "./components/metering-record.vue";
-import PDFView from "@/components/PDFView/index.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const pdfUrlList = ref([]);
 const fileUrl = ref();
@@ -324,6 +320,12 @@ const searchChangeState = () => {
   dataList();
 };
 
+const PDFDrawerViewRef = ref(null);
+const toShowPDF = (row) => {
+  let url = import.meta.env.VITE_APP_UPLOAD_URL + row.pdfPath;
+  PDFDrawerViewRef.value && PDFDrawerViewRef.value.showPdf(url);
+};
+
 const radio1 = ref("1");
 const disabledDate = (time) => {
   return time.getTime() < Date.now(); // 8.64e7 毫秒数代表一天

+ 30 - 39
src/views/flow/common/CheckTopInfos/components/op_bottom_table.vue

@@ -17,7 +17,6 @@
       @size-change="dataList"
       @current-change="dataList"
     >
-
       <template #filePath-form="scope">
         <div style="height: 100px; width: 100px; overflow: hidden">
           <!--          <PDFView-->
@@ -27,7 +26,11 @@
           <!--            :show-pdf-number="form.showAppointPageNum"-->
           <!--            :pdf-source="pdfPath"-->
           <!--          />-->
-          <el-button link type="primary" @click="toShowPDF(pdfPath,form.showAppointPageNum)">
+          <el-button
+            link
+            type="primary"
+            @click="toShowPDF(pdfPath, form.showAppointPageNum)"
+          >
             预览
           </el-button>
         </div>
@@ -40,26 +43,22 @@
         <!--          :is-link="true"-->
         <!--          :pdf-source="getSOAPpdf(row)"-->
         <!--        />-->
-        <el-button link type="primary" @click="toShowPDF(row.filePath,1)">
+        <el-button link type="primary" @click="toShowPDF(row.filePath, 1)">
           查看PDF
         </el-button>
       </template>
     </avue-crud>
     <el-dialog v-model="dialogVisible">
-      <VuePdfEmbed :source="previewImgUrl" annotation-layer text-layer/>
+      <VuePdfEmbed :source="previewImgUrl" annotation-layer text-layer />
     </el-dialog>
     <PDFDrawerView ref="PDFDrawerViewRef"></PDFDrawerView>
   </div>
 </template>
 <script setup>
-import {ref, getCurrentInstance} from "vue";
-import {useCrud} from "@/hooks/userCrud";
-import {getTableConfig} from "./configs";
-import PDFView from "@/components/PDFView/index.vue";
-import VuePdfEmbed from "vue-pdf-embed";
-import {
-  getBomVersion,
-} from "@/api/craft/process/index";
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { getTableConfig } from "./configs";
+import { getBomVersion } from "@/api/craft/process/index";
 
 const props = defineProps({
   tableTitle: {
@@ -95,14 +94,14 @@ const toShowPDF = (pdfPath, pdfNum) => {
 const route = useRoute();
 const tableConfig = getTableConfig(props.operationId);
 // 传入一个url,后面不带/
-const {url, form, data, option, search, page, toDeleteIds, Methords, Utils} =
+const { url, form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: tableConfig[props.tableType].url,
   });
 
-const {dataList, createRow, updateRow, deleteRow, searchChange, resetChange} =
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
-const {selectionChange, multipleUpdate} = Methords; //选中和批量删除事件
+const { selectionChange, multipleUpdate } = Methords; //选中和批量删除事件
 
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const bomVersion = ref(null);
@@ -140,19 +139,18 @@ const startCreat = () => {
       selectedVersion.value = bomVersion.value;
       goToSelectMaterial();
     } else {
-      getBomVersion({materialCode: route.fullPath.split("/")[5]}).then(
+      getBomVersion({ materialCode: route.fullPath.split("/")[5] }).then(
         (res) => {
           versionList.value = res?.data ?? [];
           versionDV.value = true;
         }
       );
     }
-
   } else if (props.tableType === "dianjian") {
     commonTableType.value = "OP_CHECK";
     nextTick(() => {
       commonTableRef.value?.startSelect({
-        operationId: route.params.id
+        operationId: route.params.id,
       });
       commonTableRef.value?.mergeOption({
         selection: true,
@@ -160,7 +158,6 @@ const startCreat = () => {
         header: false,
         selectable: function (row, index) {
           return row.isSelect;
-
         },
       });
     });
@@ -193,13 +190,11 @@ const startCreat = () => {
   }
 };
 
-
-
 const saveSortData = async () => {
   multipleUpdate();
 };
 
-defineExpose({startCreat, saveSortData});
+defineExpose({ startCreat, saveSortData });
 
 const onSortChange = () => {
   data.value.forEach((item) => {
@@ -218,16 +213,16 @@ const getSOAPpdf = (itemValue) => {
 };
 
 onMounted(() => {
-  routeId.value = props.routeId
-  search.value.operationId = props.operationId + ""
+  routeId.value = props.routeId;
+  search.value.operationId = props.operationId + "";
   url.value = tableConfig[props.tableType].url;
   search.value.isTree = props.isTree;
   if (props.groupId) {
     search.value.itemGroupId = props.groupId;
-    itemGroup.value=props.groupId;
+    itemGroup.value = props.groupId;
   }
   //物料双规格分组的话没有编辑,删除要自定义
-  if (props.isTree === '1') {
+  if (props.isTree === "1") {
     option.value = Object.assign(option.value, {
       searchEnter: true,
       addBtn: false,
@@ -255,7 +250,7 @@ onMounted(() => {
 watch(
   () => props.tableType,
   () => {
-    routeId.value = props.routeId
+    routeId.value = props.routeId;
     url.value = tableConfig[props.tableType].url;
     option.value = Object.assign(option.value, {
       searchEnter: true,
@@ -273,7 +268,7 @@ watch(
 watch(
   () => props.groupId,
   () => {
-    routeId.value = props.routeId
+    routeId.value = props.routeId;
     url.value = tableConfig[props.tableType].url;
     option.value = Object.assign(option.value, {
       searchEnter: true,
@@ -283,22 +278,18 @@ watch(
       sortable: true,
       column: tableConfig[props.tableType].column,
     });
-    search.value.itemGroupId = props.groupId
-    itemGroup.value = props.groupId
-    console.log("aaaa",itemGroup.value);
+    search.value.itemGroupId = props.groupId;
+    itemGroup.value = props.groupId;
+    console.log("aaaa", itemGroup.value);
     dataList();
   }
 );
 watch(
-    () => props.operationId,
-    () => {
-
-    }
+  () => props.operationId,
+  () => {}
 );
 watch(
-    () => props.routeId,
-    () => {
-
-    }
+  () => props.routeId,
+  () => {}
 );
 </script>