qinhb 1 år sedan
förälder
incheckning
950ce2a541

+ 1 - 1
src/components/Upload/ExcelUpload.vue

@@ -91,7 +91,7 @@ const handleSubmit = async () => {
   let data: any = await request({
     url: uploadUrl.value,
     method: "post",
-    data: { ...importData, ...importData },
+    data: { ...importData, ...otherParams },
     headers: {
       "Content-Type": "multipart/form-data",
     },

+ 1 - 0
src/hooks/userCrud.ts

@@ -327,6 +327,7 @@ export const useCrud = (config?: UseCrudConfig) => {
      * 根据搜索项导出数据
      */
     exportData: async (urlStr: string) => {
+      handleSearchData();
       const response = await request({
         url: urlStr,
         method: "post",

+ 1 - 1
src/views/plan/schedule/index.vue

@@ -110,7 +110,7 @@ option.value = Object.assign(option.value, {
   delBtn: false,
   column: [
     {
-      label: "序列号",
+      label: "流转卡号",
       prop: "seqNo",
       editDisabled: true,
       search: true,

+ 2 - 2
src/views/plan/workOrder/components/work-order-seq.vue

@@ -84,7 +84,7 @@ option.value = Object.assign(option.value, {
   menu: false,
   column: [
     {
-      label: "序列号",
+      label: "流转卡号",
       prop: "seqNo",
       search: true,
       overHidden: true,
@@ -120,7 +120,7 @@ const uploadFinished = () => {
 };
 const importExcelData = () => {
   if (uploadRef.value) {
-    uploadRef.value.show("/api/v1/plan/seq/import");
+    uploadRef.value.show("/api/v1/plan/seq/import","流转号导入",{workOrderCode: props.workOrderCode});
   }
 };
 </script>

+ 1 - 0
src/views/plan/workOrder/index.vue

@@ -334,6 +334,7 @@ const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 option.value = Object.assign(option.value, {
   delBtn: false,
   selection: true,
+  viewBtn: false,
   editBtn: false,
   column: [
     {

+ 3 - 3
src/views/pro/traceability/index.vue

@@ -25,7 +25,7 @@
             <el-descriptions-item label="产品名称">{{
               productReviewInfo.materialName
             }}</el-descriptions-item>
-            <el-descriptions-item label="序列号">{{
+            <el-descriptions-item label="流转卡号">{{
               productReviewInfo.seqNo
             }}</el-descriptions-item>
             <el-descriptions-item label="物料编号">{{
@@ -96,7 +96,7 @@ const chooseTagType = (row, type) => {
       ? "订单"
       : row.startsWith("GD")
         ? "工单"
-        : "序列号";
+        : "流转卡号";
   } else {
     daynamicType = row.startsWith("DD")
       ? "success"
@@ -157,7 +157,7 @@ option.value = Object.assign(option.value, {
       hide: true,
     },
     {
-      label: "产品序列号",
+      label: "流转卡号",
       prop: "seqNo",
       search: true,
       searchLabelWidth: "100",

+ 1 - 1
src/views/quality/outsource/index.vue

@@ -76,7 +76,7 @@
                   :data="form.details"
                   highlight-current-row>
                 <el-table-column
-                    label="序列号"
+                    label="流转卡号"
                     align="left"
                     width=350
                     prop="seqNo"

+ 1 - 1
src/views/storage/stock/index.vue

@@ -156,7 +156,7 @@ option.value = Object.assign(option.value, {
       search: true
     },
     {
-      label: "序列号",
+      label: "流转卡号",
       width: 130,
       overHidden: true,
       prop: "seqNo",