钎焊流程

src/api/braze/index.ts

@@ -25,3 +25,16 @@ export function baseBrazeList(data: any) {
     data
   });
 }
+
+/**
+ * 履历钎焊绑定分页查询
+ *
+ * @param data
+ */
+export function processBrazePage(data: any) {
+  return request({
+    url: "/api/v1/processBraze/brazePage",
+    method: "post",
+    data
+  });
+}

src/api/craft/process/index.ts

@@ -94,7 +94,7 @@ export function operationBraze(operationId: string | number) {
  */
 export function operationBrazeAdd(data: any) {
   return request({
-    url: `/api/v1//operationBraze/add`,
+    url: `/api/v1/operationBraze/add`,
     method: "post",
     data
   });
@@ -107,7 +107,7 @@ export function operationBrazeAdd(data: any) {
  */
 export function operationBrazeDel(data: any) {
   return request({
-    url: `/api/v1//operationBraze/del`,
+    url: `/api/v1/operationBraze/del`,
     method: "post",
     data
   });

src/views/base/braze/bindBraze/index.vue

@@ -16,21 +16,21 @@
       @current-change="dataList"
       @selection-change="selectionChange"
     >
-      <template #viewPath-form="scope">
+      <!-- <template #viewPath-form="scope">
         <FilesUpload
             v-model:src="fileUrl"
             v-model:file-name-list="fileNameList"
             :limit="1"
             @finished="testFiles"
           />
-      </template>
+      </template> -->
       <template #menu="{ row, index, type }">
-        <PDFView
+        <!-- <PDFView
           :need-to-show-pdf="true"
           content-type="button"
           :is-link="true"
-          :pdf-source="filePath + row.pdfPath"
-        />
+          :pdf-source="filePath + row.viewPath"
+        /> -->
         <el-button
           @click="deleteRecord(row, index, done)"
           text
@@ -40,8 +40,6 @@
         >
       </template>
     </avue-crud>
-
-    <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
   </div>
 </template>
 <script setup>
@@ -76,14 +74,22 @@ const { selectionChange } = Methords; //选中和批量删除事件
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const route = useRoute();
 search.value['brazeId'] = route.params.id
+search.value.orders = [
+  {column: "created", isAsc: true}
+]
 onMounted?.(() => {
   // console.log("crudRef", crudRef)
   dataEditList();
 });
+//客户需要默认值
+form.value.length = "270"
+form.value.lineColor = "白色"
 const addRow = (form2, done) => {
   form.value.brazeId = route.params.id
   createRow(form, done, done);
   fileUrl.value = "";
+  form.value.length = "270"
+  form.value.lineColor = "白色"
   fileNameList.value = [];
 };
 /**
@@ -105,7 +111,7 @@ option.value = Object.assign(option.value, {
   menu: true,
   column: [
     {
-      label: "起始段",
+      label: "起始端",
       prop: "lineStart",
       width: 150,
       search: true,
@@ -113,7 +119,7 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "请填写起始段",
+          message: "请填写起始端",
           trigger: "blur",
         },
       ],
@@ -133,19 +139,23 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "线径",
+      label: "线型",
       prop: "wireDiameter",
       width: 150,
       overHidden: true,
       rules: [
         {
           required: true,
-          message: "请填写线径",
+          message: "请填写线型",
           trigger: "blur",
         },
       ],
     },
     {
+      label: "线管",
+      prop: "lineNo",
+    },
+    {
       label: "长度",
       prop: "length",
       type: "number",
@@ -156,21 +166,22 @@ option.value = Object.assign(option.value, {
       label: "颜色",
       prop: "lineColor",
     },
-    {
-      label: "文件",
-      prop: "viewPath",
-      span: 24,
-      slot: true,
-      hide: true,
-    },
-    {
-      label: "文件名称",
-      prop: "viewName",
-      span: 24,
-      width: 120,
-      overHidden: true,
-      display: false,
-    },
+    
+    // {
+    //   label: "文件",
+    //   prop: "viewPath",
+    //   span: 24,
+    //   slot: true,
+    //   hide: true,
+    // },
+    // {
+    //   label: "文件名称",
+    //   prop: "viewName",
+    //   span: 24,
+    //   width: 120,
+    //   overHidden: true,
+    //   display: false,
+    // },
     {
       label: "创建时间",
       prop: "created",

src/views/base/braze/index.vue

@@ -16,6 +16,14 @@
       @current-change="dataList"
       @selection-change="selectionChange"
     >
+      <template #filePath-form="scope">
+          <FilesUpload
+              v-model:src="fileUrl"
+              v-model:file-name-list="fileNameList"
+              :limit="1"
+              @finished="testFiles"
+            />
+      </template>
       <template #menu-left="{ size }">
         <el-button
           :disabled="toDeleteIds.length < 1"
@@ -40,6 +48,12 @@
         />
       </template>
       <template #menu="{ row, index, type }">
+        <PDFView
+          :need-to-show-pdf="true"
+          content-type="button"
+          :is-link="true"
+          :pdf-source="filePath + row.filePath"
+        />
         <el-button
           type="primary"
           link
@@ -67,7 +81,13 @@ const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 onMounted(() => {
   dataList();
 });
-
+const fileUrl = ref(""); //单文件
+const fileNameList = ref([]);
+const testFiles = () => {
+  form.value.filePath = fileUrl.value;
+  form.value.fileName = fileNameList.value[0];
+};
+const filePath = import.meta.env.VITE_APP_UPLOAD_URL;
 option.value = Object.assign(option.value, {
   selection: true,
   labelWidth: 110,
@@ -112,14 +132,29 @@ option.value = Object.assign(option.value, {
       ]
     },
     {
-      label: "启用状态",
+      label: "文件",
+      prop: "filePath",
+      span: 24,
       slot: true,
-      headerAlign: "center",
-      prop: "enable",
-      width: 100,
-      addDisplay: false,
-      editDisplay: false
-    }
+      hide: true,
+    },
+    {
+      label: "文件名称",
+      prop: "fileName",
+      span: 24,
+      width: 120,
+      overHidden: true,
+      display: false,
+    },
+    // {
+    //   label: "启用状态",
+    //   slot: true,
+    //   headerAlign: "center",
+    //   prop: "enable",
+    //   width: 100,
+    //   addDisplay: false,
+    //   editDisplay: false
+    // }
   ],
 });
 const router = useRouter();

src/views/base/craftManagement/route/components/configs.ts

@@ -344,7 +344,7 @@ export const comTypes: comType[] = [
     compentType: "screwdriver",
   },
   {
-    compentName: "钎焊采集",
+    compentName: "钎焊指引",
     compentType: "braze",
   },
 ];

src/views/pro/traceability/components/brazeCom.vue

@@ -0,0 +1,76 @@
+<!-- 点检判定 -->
+<template>
+  <div class="mainContentBox">
+    <avue-crud
+      ref="crudRef2"
+      :data="tableData"
+      :option="option"
+    />
+  </div>
+</template>
+<script setup>
+import {processBrazePage} from '@/api/braze'
+const tableData = ref([])
+const option =  {
+  addBtn: false,
+  selection: false,
+  viewBtn: false,
+  editBtn: false,
+  delBtn: false,
+  menu: false,
+  column: [
+  {
+      label: "工序名称",
+      prop: "operationName",
+    },
+    {
+      label: "钎焊编码",
+      prop: "brazeCode",
+    },
+    {
+      label: "钎焊名称",
+      prop: "brazeName",
+    },
+    {
+      label: "起始端",
+      prop: "lineStart",
+    },
+    {
+      label: "结束端",
+      prop: "lineEnd",
+    },
+    {
+      label: "线径",
+      prop: "wireDiameter",
+      hide: true,
+    },
+    {
+      label: "长度",
+      prop: "length",
+      hide: true,
+    },
+    {
+      label: "操作人",
+      prop: "updator",
+    },
+    {
+      label: "操作时间",
+      prop: "updated",
+    }
+  ],
+};
+const refreshTra = (row) => {
+  const data = {
+    seqNo: row.seqNo,
+    workOrderCode: row.workOrderCode,
+  }
+  dataList(data)
+};
+defineExpose({ refreshTra });
+
+const dataList = (data) => {
+  processBrazePage(data).then(res => {
+    tableData.value = res.data.records
+  })
+}
+</script>

src/views/pro/traceability/index.vue

@@ -185,6 +185,19 @@
               </template>
               <CollectionCom ref="collectionComRef"
             /></el-tab-pane>
+            <el-tab-pane name="brazeComRef" label="钎焊指引">
+              <template #label>
+                <span
+                  >钎焊指引
+                  <el-badge
+                    :value="tabCount.brazeCount"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+             <BrazeCom ref="brazeComRef"/>
+           </el-tab-pane>
           </el-tabs>
         </el-main>
       </el-container>
@@ -205,6 +218,7 @@ import FaultCom from "@/views/pro/traceability/components/faultCom.vue";
 import MediaCom from "./components/mediaCom.vue";
 import ExcelCom from "./components/excelCom.vue";
 import CollectionCom from "./components/collectionCom.vue";
+import BrazeCom from "./components/brazeCom.vue";
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -227,6 +241,7 @@ const faultComRef = ref(null);
 const mediaComRef = ref(null);
 const excelComRef = ref(null);
 const collectionComRef = ref(null);
+const brazeComRef = ref(null);
 let defaultTabName = ref("traceabilityComRef");
 //tab页组件
 const tabNameComRef = new Map([
@@ -239,6 +254,7 @@ const tabNameComRef = new Map([
   ["mediaComRef", mediaComRef],
   ["excelComRef", excelComRef],
   ["collectionComRef", collectionComRef],
+  ["brazeComRef", brazeComRef]
 ]);
 let temRow = ref({});
 const tabsEvent = (pane, ev) => {
@@ -282,6 +298,7 @@ let tabCount = reactive({
   fault: "",
   medias: "",
   excel: "",
+  brazeCount: ""
 });
 
 const handleCellClick = (row, column, event) => {