优化青半（表格权限按钮添加...5条）

src/common/configs/buttonPermission.ts

@@ -38,6 +38,8 @@ const ButtonPermKeys = {
       dict_add: "sys:dict:add",
       dict_edit: "sys:dict:edit",
       dict_del: "sys:dict:del",
+
+      traceability_excel_update: "traceability::excel::update",
     },
   },
   // 订单管理

src/views/base/craftManagement/route/bindProcess.vue

@@ -164,7 +164,7 @@
           </div>
           <!-- 工序信息编辑模式 -->
           <div v-else>
-            <div v-if="currentProcess.id">
+            <div v-if="currentProcess.id" style="padding-right: 5px">
               <avue-form
                 ref="formRef"
                 :option="formOption"

src/views/base/craftManagement/route/components/setExcel/index.vue

@@ -47,7 +47,7 @@
       <div class="dialog">
         <div>
           请选择Excel模板:
-          <el-select v-model="value1" multiple placeholder="Select">
+          <el-select v-model="value1" multiple placeholder="Select" filterable>
             <el-option
               v-for="item in options"
               :key="item.value"

src/views/base/craftManagement/route/index.vue

@@ -78,10 +78,22 @@
           @click="deleteRow(row, index)"
           >删除</el-button
         >
-        <el-button link type="primary" v-if="row.upgradeVersion==='1'" icon="el-icon-notification" @click="changeLog(row)"
-        >修改记录</el-button>
-          <el-button link type="primary" v-if="row.isMain==='0'" icon="el-icon-setting" @click="setMain(row)"
-          >主路线</el-button>
+        <el-button
+          link
+          type="primary"
+          v-if="row.upgradeVersion === '1'"
+          icon="el-icon-notification"
+          @click="changeLog(row)"
+          >修改记录</el-button
+        >
+        <el-button
+          link
+          type="primary"
+          v-if="row.isMain === '0'"
+          icon="el-icon-setting"
+          @click="setMain(row)"
+          >主路线</el-button
+        >
         <el-button
           link
           icon="el-icon-copy-document"
@@ -89,7 +101,10 @@
           @click="copyRow(row)"
           >升版</el-button
         >
-        <el-button link icon="el-icon-copy-document" @click="bindProcessPop(row)"
+        <el-button
+          link
+          icon="el-icon-copy-document"
+          @click="bindProcessPop(row)"
           >绑定</el-button
         >
       </template>
@@ -172,36 +187,56 @@
       </template>
     </el-dialog>
     <el-dialog
-        v-model="dialog1.visible"
-        :title="dialog1.title"
-        width="900px"
-        @close="dialog1.visible=false"
-        :destroy-on-close="true"
+      v-model="dialog1.visible"
+      :title="dialog1.title"
+      width="900px"
+      @close="dialog1.visible = false"
+      :destroy-on-close="true"
     >
       <RouteChangeLog :targetRouteId="routeDeatil.id" />
     </el-dialog>
     <el-dialog
-        v-model="dialog2.visible"
-        :title="dialog2.title"
-        width="900px"
-        @close="dialog2.visible=false"
-        :destroy-on-close="true"
+      v-model="dialog2.visible"
+      :title="dialog2.title"
+      width="900px"
+      @close="dialog2.visible = false"
+      :destroy-on-close="true"
     >
-
-        <el-table :data="tableData" style="width: 100%" ref="singleTableRef" highlight-current-row @current-change="handleCurrentChange">
-          <el-table-column type="index" width="50" />
-          <el-table-column prop="id" label="id" width="180" v-if="false" />
-          <el-table-column prop="processRouteName" label="工艺路线名称" width="180" />
-          <el-table-column prop="processRouteCode" label="工艺路线编码" width="180" />
-          <el-table-column prop="processRouteVersion" label="版本" />
-          <el-table-column prop="prodtName" label="产品名称"  />
-          <el-table-column prop="prodtModel" label="产品规格" width="180" />
-        </el-table>
+      <el-table
+        :data="tableData"
+        style="width: 100%"
+        ref="singleTableRef"
+        highlight-current-row
+        @current-change="handleCurrentChange"
+      >
+        <el-table-column type="index" width="50" />
+        <el-table-column prop="id" label="id" width="180" v-if="false" />
+        <el-table-column
+          prop="processRouteName"
+          label="工艺路线名称"
+          width="180"
+        />
+        <el-table-column
+          prop="processRouteCode"
+          label="工艺路线编码"
+          width="180"
+        />
+        <el-table-column prop="processRouteVersion" label="版本" />
+        <el-table-column prop="prodtName" label="产品名称" />
+        <el-table-column prop="prodtModel" label="产品规格" width="180" />
+      </el-table>
       <template #footer>
         <div class="footer">
-          <el-button type="primary" @click="copyProcess()" :loading="isLoading">复制</el-button>
-          <el-button type="primary" @click="bindProcess(rowDetail)" :loading="loading">自定义</el-button>
-          <el-button @click="dialog2.visible=false">取消</el-button>
+          <el-button type="primary" @click="copyProcess()" :loading="isLoading"
+            >复制</el-button
+          >
+          <el-button
+            type="primary"
+            @click="bindProcess(rowDetail)"
+            :loading="loading"
+            >自定义</el-button
+          >
+          <el-button @click="dialog2.visible = false">取消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -218,13 +253,13 @@ import {
   copyRoute,
   editRouteWith,
   getMaxRouteVersion,
-  updateMain
+  updateMain,
 } from "@/api/craft/route/index";
 import { getUserList } from "@/api/system/user/index";
 import RouteChangeLog from "@/views/base/craftManagement/route/components/routeChangeLog.vue";
-import {ElMessageBox} from "element-plus";
-const isLoading=ref(false);
-const loading=ref(false);
+import { ElMessageBox } from "element-plus";
+const isLoading = ref(false);
+const loading = ref(false);
 // 数据字典相关
 const { dicts } = useDictionaryStore();
 const sureCancelProductManager = () => {
@@ -236,24 +271,20 @@ const tableData = ref([]);
 const currentRow = ref();
 const singleTableRef = ref(null);
 const handleCurrentChange = (val) => {
-  currentRow.value = val
-}
-const setMain = (row) =>{
+  currentRow.value = val;
+};
+const setMain = (row) => {
   ElMessageBox.confirm("是否将该工艺路线设置为主路线？", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
-    type: "warning",}).then(async()=>{
-    updateMain(row).then(
-        (data)=>{
-          ElMessage.success(data.msg);
-          dataList();
-        }
-    )
-
-   }
-
-  )
-}
+    type: "warning",
+  }).then(async () => {
+    updateMain(row).then((data) => {
+      ElMessage.success(data.msg);
+      dataList();
+    });
+  });
+};
 const dialog1 = ref({
   title: "修改记录",
   visible: false,
@@ -262,19 +293,18 @@ const dialog2 = ref({
   title: "绑定",
   visible: false,
 });
-const routeData =ref({});
+const routeData = ref({});
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/op/route",
-    afterAdd:(routeData)=>{
-      if(routeData.sourceRouteId){
+    afterAdd: (routeData) => {
+      if (routeData.sourceRouteId) {
         router.push({
           path: `/base/craftManagement/bindProcess/${routeData.id}/${routeData.prodtCode}`,
         });
       }
-
-    }
+    },
   });
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
@@ -314,9 +344,9 @@ const sureToEditProductManager = () => {
   });
 };
 
-const copyProductProject =ref({});
-const copyProcess = () =>{
-  if(!currentRow.value){
+const copyProductProject = ref({});
+const copyProcess = () => {
+  if (!currentRow.value) {
     ElMessage.error("未选择要复制工艺路线!");
     return;
   }
@@ -324,26 +354,21 @@ const copyProcess = () =>{
   loading.value = true;
   copyProductProject.value.sourceId = currentRow.value.id;
   copyProductProject.value.targetId = rowDetail.value.id;
-  copyProductRoute(copyProductProject.value).then(
-    (data)=>{
-      if(data.code==='200'){
+  copyProductRoute(copyProductProject.value)
+    .then((data) => {
+      if (data.code === "200") {
         isLoading.value = false;
         loading.value = false;
         dialog2.value.visible = false;
         dataList();
         ElMessage.success(data.msg);
       }
-    }
-  ).finally(()=>{
-    isLoading.value = false;
-    loading.value = false;
-
-
-  })
-
-
-
-}
+    })
+    .finally(() => {
+      isLoading.value = false;
+      loading.value = false;
+    });
+};
 onMounted(() => {
   // console.log("crudRef", crudRef)
   dataList();
@@ -365,7 +390,7 @@ const routeDeatil = ref({});
 const changeLog = (row) => {
   routeDeatil.value = row;
   dialog1.value.visible = true;
-}
+};
 const doEdit = (row, index) => {
   row.prodtName1 = row.prodtName;
   crudRef.value && crudRef.value.rowEdit(row, index);
@@ -405,31 +430,26 @@ const startChooseRoute = () => {
 };
 // 已经绑定了工序的可以复制，跟后端HT商量只传id即可。
 const copyRow = (row) => {
-  option.value.column.forEach((item)=>{
-    if(item.prop==="commonRouteCode"||item.prop==="commonRouteName"){
-      item.display=false;
+  option.value.column.forEach((item) => {
+    if (item.prop === "commonRouteCode" || item.prop === "commonRouteName") {
+      item.display = false;
     }
-      }
-
-  );
+  });
   if (row.usable == 0) {
     ElMessage.error("该路线未被绑定!");
     return;
   }
-  getMaxRouteVersion(row.prodtCode).then((data)=>{
-        if(data.code==='200'){
-          form.value = Object.assign(form.value, row);
-          form.value.processRouteVersion ='';
-          if(data.data){
-            form.value.processRouteVersion =(parseFloat(data.data)+1).toFixed(1);
-          }
-          form.value.prodtName1 = row.prodtName;
-          crudRef.value.rowAdd();
-        }
-  }
-
-  )
-
+  getMaxRouteVersion(row.prodtCode).then((data) => {
+    if (data.code === "200") {
+      form.value = Object.assign(form.value, row);
+      form.value.processRouteVersion = "";
+      if (data.data) {
+        form.value.processRouteVersion = (parseFloat(data.data) + 1).toFixed(1);
+      }
+      form.value.prodtName1 = row.prodtName;
+      crudRef.value.rowAdd();
+    }
+  });
 };
 
 const renameRoute = () => {
@@ -455,29 +475,24 @@ const bindProcess = (row) => {
 };
 
 const bindProcessPop = (row) => {
-  if(row.routeData){
+  if (row.routeData) {
     router.push({
       path: `/base/craftManagement/bindProcess/${row.id}/${row.prodtCode}`,
     });
     return;
   }
-  copyList(row).then(
-    (data)=>{
-      tableData.value = data.data;
-      console.log(tableData.value);
-      if(!tableData.value||tableData.value.length==0){
-        router.push({
-          path: `/base/craftManagement/bindProcess/${row.id}/${row.prodtCode}`,
-        });
-        return;
-      }
-      rowDetail.value = row;
-      dialog2.value.visible = true;
+  copyList(row).then((data) => {
+    tableData.value = data.data;
+    console.log(tableData.value);
+    if (!tableData.value || tableData.value.length == 0) {
+      router.push({
+        path: `/base/craftManagement/bindProcess/${row.id}/${row.prodtCode}`,
+      });
+      return;
     }
-  )
-
-
-
+    rowDetail.value = row;
+    dialog2.value.visible = true;
+  });
 };
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {

src/views/base/craftManagement/routeCommon/index.vue

@@ -60,11 +60,17 @@
           icon="el-icon-copy-document"
           :disabled="false"
           @click="copyRow(row)"
-          v-if="row.routeData!=null&&row.routeData!=''"
+          v-if="row.routeData != null && row.routeData != ''"
           >复制</el-button
         >
-        <el-button link type="primary" v-if="row.upgradeVersion==='1'" icon="el-icon-notification" @click="changeLog(row)"
-        >修改记录</el-button>
+        <el-button
+          link
+          type="primary"
+          v-if="row.upgradeVersion === '1'"
+          icon="el-icon-notification"
+          @click="changeLog(row)"
+          >修改记录</el-button
+        >
         <el-button link icon="el-icon-copy-document" @click="bindProcess(row)"
           >绑定</el-button
         >
@@ -106,11 +112,11 @@
       </template>
     </el-dialog>
     <el-dialog
-        v-model="dialog1.visible"
-        :title="dialog1.title"
-        width="900px"
-        @close="dialog1.visible=false"
-        :destroy-on-close="true"
+      v-model="dialog1.visible"
+      :title="dialog1.title"
+      width="900px"
+      @close="dialog1.visible = false"
+      :destroy-on-close="true"
     >
       <RouteChangeLog :targetRouteId="routeDeatil.id" />
     </el-dialog>
@@ -169,7 +175,7 @@ const changeLog = (row) => {
   routeDeatil.value = row;
   console.log(routeDeatil.value);
   dialog1.value.visible = true;
-}
+};
 /**
  * 上传excel相关
  */
@@ -287,7 +293,6 @@ option.value = Object.assign(option.value, {
       prop: "executeFileStd",
       width: 180,
       addDisplay: true,
-      editDisabled: true,
       overHidden: true,
       rules: [
         {

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

@@ -26,6 +26,7 @@
           link
           size="small"
           @click="opUpdate(row)"
+          v-hasPerm="[ButtonPermKeys.SYSTEM.BTNS.traceability_excel_update]"
           style="margin: 0"
           ><i-ep-edit />修改表格数据
         </el-button>

src/views/quality/opRecord/index.vue

@@ -1,23 +1,23 @@
 <template>
   <div class="mainContentBox">
     <avue-crud
-        ref="crudRef"
-        v-model:search="search"
-        v-model="form"
-        :data="data"
-        :option="option"
-        v-model:page="page"
-        @row-save="createRowSave"
-        @row-update="updateRow"
-        @row-del="deleteRow"
-        :table-loading="loading"
-        @search-change="searchChange"
-        @search-reset="resetChange"
-        @size-change="dataList"
-        @current-change="dataList"
-        @selection-change="selectionChange"
+      ref="crudRef"
+      v-model:search="search"
+      v-model="form"
+      :data="data"
+      :option="option"
+      v-model:page="page"
+      @row-save="createRowSave"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      :table-loading="loading"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
     >
-<!--      <template #menu-right="{}">
+      <!--      <template #menu-right="{}">
         <el-button
             class="ml-3"
             @click="handleExport"
@@ -26,7 +26,7 @@
         </el-button>
       </template>-->
       <template #menu="{ size, row, index }">
-<!--        <el-button
+        <!--        <el-button
             icon="el-icon-edit"
             text
             @click="openDialog(1, row.id)"
@@ -36,33 +36,52 @@
         >-->
 
         <el-button
-            icon="el-icon-view"
-            text
-            @click="openDialog(0, row)"
-            type="primary"
-            :size="size"
-        >详情</el-button
+          icon="el-icon-view"
+          text
+          @click="openDialog(0, row)"
+          type="primary"
+          :size="size"
+          >详情</el-button
         >
       </template>
     </avue-crud>
     <el-dialog
-        v-model="dialog.visible"
-        :title="dialog.title"
-        width="1600px"
-        @close="dialog.visible = false"
+      v-model="dialog.visible"
+      :title="dialog.title"
+      width="1600px"
+      @close="dialog.visible = false"
     >
       <el-table :data="itemList" border style="width: 100%">
-        <el-table-column show-overflow-tooltip  prop="operationName" label="工序" width="90"/>
-        <el-table-column show-overflow-tooltip  prop="materialModel" label="物料型号" width="90"/>
-        <el-table-column show-overflow-tooltip  prop="workOrderCode" label="产品批号" width="90"/>
+        <el-table-column
+          show-overflow-tooltip
+          prop="operationName"
+          label="工序"
+          width="90"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="materialModel"
+          label="物料型号"
+          width="90"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="workOrderCode"
+          label="产品批号"
+          width="90"
+        />
         <el-table-column prop="reReceiveUser" label="操作人" width="140">
-          <template v-if="dialog.type === 1"  #default="scope">
+          <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.reReceiveUser"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="reDate" label="时间" width="120">
-          <template v-if="dialog.type === 1"  #default="scope">
-            <el-date-picker value-format="YYYY-MM-DD" type="date" v-model="scope.row.reDate"></el-date-picker>
+          <template v-if="dialog.type === 1" #default="scope">
+            <el-date-picker
+              value-format="YYYY-MM-DD"
+              type="date"
+              v-model="scope.row.reDate"
+            ></el-date-picker>
           </template>
         </el-table-column>
         <el-table-column prop="reNum" label="接收数量" width="80">
@@ -76,105 +95,106 @@
           </template>
         </el-table-column>
         <el-table-column prop="next1Num" label="不合格品数" width="80">
-          <template v-if="dialog.type === 1"  #default="scope">
+          <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.next1Num"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="passRate" label="合格品率" width="80">
-          <template v-if="dialog.type === 1"  #default="scope">
+          <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.passRate"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="useDevice" label="使用设备及编号" width="150">
-          <template v-if="dialog.type === 1"  #default="scope">
+          <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.useDevice"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="craftCondition" label="工艺条件" width="160">
-          <template v-if="dialog.type === 1"  #default="scope">
+          <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.craftCondition"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="temperature" label="温度" width="85">
-          <template v-if="dialog.type === 1"  #default="scope">
+          <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.temperature"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="humidity" label="湿度" width="85">
-          <template v-if="dialog.type === 1"  #default="scope">
+          <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.humidity"></el-input>
           </template>
         </el-table-column>
 
         <el-table-column prop="remark" label="备注" width="100">
-          <template v-if="dialog.type === 1"  #default="scope">
+          <template v-if="dialog.type === 1" #default="scope">
             <el-input v-model="scope.row.remark"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="none" label="关联表单">
-<!--          <template  #default="scope">
+          <!--          <template  #default="scope">
             <el-button v-if="scope.row.type == 1" @click="clickH(scope.row)" type="primary" link>
               工作记录表
             </el-button>
           </template>-->
-          <template  #default="scope">
+          <template #default="scope">
             <el-button
-                icon="el-icon-setting"
-                text
-                @click="formList(scope.row)"
-                type="primary"
-                size="small"
-            >表单列表</el-button>
+              icon="el-icon-setting"
+              text
+              @click="formList(scope.row)"
+              type="primary"
+              size="small"
+              >表单列表</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
 
-      <div
-          class="dialog-footer"
-          align="center"
-          style="margin-top: 10px;"
-      >
+      <div class="dialog-footer" align="center" style="margin-top: 10px">
         <el-button @click="dialog.visible = false">取 消</el-button>
-        <el-button type="primary" @click="handleExport" v-if="itemList.value !== 0">导 出</el-button>
+        <el-button
+          type="primary"
+          @click="handleExport"
+          v-if="itemList.value !== 0"
+          >导 出</el-button
+        >
       </div>
     </el-dialog>
 
     <el-dialog
-        v-model="dialog1.visible"
-        :title="dialog1.title"
-        width="800px"
-        @close="dialog1.visible = false"
+      v-model="dialog1.visible"
+      :title="dialog1.title"
+      width="800px"
+      @close="dialog1.visible = false"
     >
-      <el-form label-width="120px" size="large" :model="hInfo" ref="applyFormRef">
+      <el-form
+        label-width="120px"
+        size="large"
+        :model="hInfo"
+        ref="applyFormRef"
+      >
         <el-row>
           <el-col :span="12">
-          <el-form-item
-              label="电路型号"
-              prop="materialModel"
-          >
-            <el-input v-model="hInfo.materialModel" />
-          </el-form-item>
+            <el-form-item label="电路型号" prop="materialModel">
+              <el-input v-model="hInfo.materialModel" />
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item
-              label="生产批号"
-              prop="workOrderCode"
-          >
-            <el-input v-model="hInfo.workOrderCode" />
-          </el-form-item>
+            <el-form-item label="生产批号" prop="workOrderCode">
+              <el-input v-model="hInfo.workOrderCode" />
+            </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="24">
-            <el-form-item  label="工艺规程" prop="craft" >
+            <el-form-item label="工艺规程" prop="craft">
               <el-input v-model="hInfo.craft" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item  label="产品装配图" prop="drawing" >
+            <el-form-item label="产品装配图" prop="drawing">
               <el-input v-model="hInfo.drawing" />
             </el-form-item>
           </el-col>
@@ -182,46 +202,30 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item
-                label="温度"
-                prop="temperature"
-            >
+            <el-form-item label="温度" prop="temperature">
               <el-input v-model="hInfo.temperature" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-                label="相对湿度"
-                prop="humidity"
-            >
+            <el-form-item label="相对湿度" prop="humidity">
               <el-input v-model="hInfo.humidity" />
             </el-form-item>
           </el-col>
-
         </el-row>
 
         <el-row>
           <el-col :span="8">
-            <el-form-item
-                label="烤箱温度设置"
-                prop="temperatureSet"
-            >
+            <el-form-item label="烤箱温度设置" prop="temperatureSet">
               <el-input v-model="hInfo.temperatureSet" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-                label="烘烤时间"
-                prop="bakeTime"
-            >
+            <el-form-item label="烘烤时间" prop="bakeTime">
               <el-input v-model="hInfo.bakeTime" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-                label="烘箱真空度"
-                prop="vacuum"
-            >
+            <el-form-item label="烘箱真空度" prop="vacuum">
               <el-input v-model="hInfo.vacuum" />
             </el-form-item>
           </el-col>
@@ -229,27 +233,18 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item
-                label="氦气流量"
-                prop="nitrogen"
-            >
+            <el-form-item label="氦气流量" prop="nitrogen">
               <el-input v-model="hInfo.nitrogen" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-                label="氧含量"
-                prop="oxygen"
-            >
+            <el-form-item label="氧含量" prop="oxygen">
               <el-input v-model="hInfo.oxygen" />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item
-                label="封前箱内相对湿度监控值"
-                prop="frontHumidity"
-            >
+            <el-form-item label="封前箱内相对湿度监控值" prop="frontHumidity">
               <el-input v-model="hInfo.frontHumidity" />
             </el-form-item>
           </el-col>
@@ -257,47 +252,33 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item
-                label="封焊功率"
-                prop="sealPower"
-            >
+            <el-form-item label="封焊功率" prop="sealPower">
               <el-input v-model="hInfo.sealPower" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-                label="封焊压力"
-                prop="sealPressure"
-            >
+            <el-form-item label="封焊压力" prop="sealPressure">
               <el-input v-model="hInfo.sealPressure" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-                label="封焊速度"
-                prop="sealSpeed"
-            >
+            <el-form-item label="封焊速度" prop="sealSpeed">
               <el-input v-model="hInfo.sealSpeed" />
             </el-form-item>
           </el-col>
         </el-row>
 
-
         <el-row>
           <el-col :span="8">
-            <el-form-item
-                label="封装数"
-                prop="num"
-            >
+            <el-form-item label="封装数" prop="num">
               <el-input v-model="hInfo.num" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="合格数" prop="passNum" >
+            <el-form-item label="合格数" prop="passNum">
               <el-input v-model="hInfo.passNum" />
             </el-form-item>
           </el-col>
-
         </el-row>
 
         <el-row>
@@ -308,44 +289,43 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="日期" prop="operatorTime">
-              <el-date-picker value-format="YYYY-MM-DD"  type="date" v-model="hInfo.operatorTime"></el-date-picker>
+              <el-date-picker
+                value-format="YYYY-MM-DD"
+                type="date"
+                v-model="hInfo.operatorTime"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
 
-      <div
-          class="dialog-footer"
-          align="center"
-          style="margin-top: 10px"
-      >
+      <div class="dialog-footer" align="center" style="margin-top: 10px">
         <el-button @click="dialog1.visible = false">取 消</el-button>
         <el-button type="primary" @click="handleExport1">导 出</el-button>
       </div>
     </el-dialog>
 
     <el-dialog
-        v-model="dialog8.visible"
-        :title="dialog8.title"
-        width="950px"
-        @close="dialog8.visible = false"
+      v-model="dialog8.visible"
+      :title="dialog8.title"
+      width="950px"
+      @close="dialog8.visible = false"
     >
       <el-card
-          style="cursor: pointer; font-size: 20px"
-          shadow="always"
-          :key="index"
-          @click="toShowExcel(item)"
-          v-for="(item, index) in showProList"
-      >{{ item.formName }}-{{item.formCode}}({{item.seqs}})</el-card
+        style="cursor: pointer; font-size: 20px"
+        shadow="always"
+        :key="index"
+        @click="toShowExcel(item)"
+        v-for="(item, index) in showProList"
+        >{{ item.formName }}-{{ item.formCode }}({{ item.seqs }})</el-card
       >
     </el-dialog>
     <el-dialog
-        v-model="excelShow"
-        title="详情"
-        @close="excelShow = false"
-        width="1600"
-        destroy-on-close
+      v-model="excelShow"
+      title="详情"
+      @close="excelShow = false"
+      width="1600"
+      destroy-on-close
     >
       <ExcelDataBbox :data="ExDataObj" @close="excelShow = false" />
     </el-dialog>
@@ -354,7 +334,16 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { exportOperationRecord,exportOperationRecord1 ,queryFormList,addProRecord,queryProductHandover,updateHandoverList,queryHInfo,saveOpDetails} from "@/api/process";
+import {
+  exportOperationRecord,
+  exportOperationRecord1,
+  queryFormList,
+  addProRecord,
+  queryProductHandover,
+  updateHandoverList,
+  queryHInfo,
+  saveOpDetails,
+} from "@/api/process";
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
@@ -366,17 +355,17 @@ const test = () => {
 const radio = ref(0);
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
-    useCrud({
-      dataListUrl: "/api/v1/proRecord/queryCompleteOpList",
-    });
+  useCrud({
+    dataListUrl: "/api/v1/proRecord/queryCompleteOpList",
+  });
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
-    Methords; //增删改查
+  Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
 const loading = ref(false);
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const dialog = reactive({
-  title: "产品交接",
+  title: "工作记录",
   visible: false,
   type: 0,
 });
@@ -391,15 +380,18 @@ const dialog8 = reactive({
 });
 const showProList = ref([]);
 const formList = (row) => {
-  queryFormList({...search.value,workOrderId: row.workOrderId,operationId: row.operationId}).then((data)=>{
-    if(data.data.length > 0){
+  queryFormList({
+    ...search.value,
+    workOrderId: row.workOrderId,
+    operationId: row.operationId,
+  }).then((data) => {
+    if (data.data.length > 0) {
       showProList.value = data.data;
       dialog8.visible = true;
-    }else{
+    } else {
       ElMessage.error("未关联到表单");
     }
-  })
-
+  });
 };
 const excelShow = ref(false);
 const ExDataObj = ref({});
@@ -407,64 +399,66 @@ const toShowExcel = (item) => {
   ExDataObj.value = item;
   excelShow.value = true;
 };
-const createRowSave = (row,done,loading) =>{
-  form.value.type = "1"
-  addProRecord(form.value).then((data) =>{
-    ElMessage.success(data.msg);
-    form.value.startDate = "";
-    form.value.endDate = "";
-    done();
-    dialog.visible = true;
-    dialog.type = 1
-    itemList.value = data.data
-    dataList()
-  }).catch(() => {
-    loading()
-  });
-}
-const itemList = ref([])
+const createRowSave = (row, done, loading) => {
+  form.value.type = "1";
+  addProRecord(form.value)
+    .then((data) => {
+      ElMessage.success(data.msg);
+      form.value.startDate = "";
+      form.value.endDate = "";
+      done();
+      dialog.visible = true;
+      dialog.type = 1;
+      itemList.value = data.data;
+      dataList();
+    })
+    .catch(() => {
+      loading();
+    });
+};
+const itemList = ref([]);
 const hInfo = ref({
-  operator: '',
-  materialModel: ''
-})
-const clickOperationType = ref(null)
+  operator: "",
+  materialModel: "",
+});
+const clickOperationType = ref(null);
 const openDialog = (type, row) => {
-  clickOperationType.value = row.operationType
-  row.type = 1
+  clickOperationType.value = row.operationType;
+  row.type = 1;
   queryProductHandover(row).then((data) => {
     itemList.value = data.data;
     dialog.visible = true;
     dialog.type = type;
   });
 };
-const clickH = (row) =>{
-  if(null === row.detailId){
-    hInfo.value = JSON.parse(JSON.stringify(row))
-    hInfo.value.operator = row.reReceiveUser
-    hInfo.value.operatorTime = row.reDate
-    hInfo.value.handoverId = row.id
-    hInfo.value.num = row.reNum
-  }else{
-    queryHInfo(row.detailId).then((data)=>{
-      hInfo.value = data.data
+const clickH = (row) => {
+  if (null === row.detailId) {
+    hInfo.value = JSON.parse(JSON.stringify(row));
+    hInfo.value.operator = row.reReceiveUser;
+    hInfo.value.operatorTime = row.reDate;
+    hInfo.value.handoverId = row.id;
+    hInfo.value.num = row.reNum;
+  } else {
+    queryHInfo(row.detailId).then((data) => {
+      hInfo.value = data.data;
     });
   }
-  dialog1.visible = true
-}
+  dialog1.visible = true;
+};
 
-const saveDetails = ()=>{
-  saveOpDetails(hInfo.value).then((data)=>{
+const saveDetails = () => {
+  saveOpDetails(hInfo.value).then((data) => {
     ElMessage.success("操作成功");
-    dialog1.visible = false
-  })
-}
+    dialog1.visible = false;
+  });
+};
 const saveItemList = () => {
   updateHandoverList(itemList.value).then((data) => {
     if (data.code === "200") {
       ElMessage.success("操作成功");
       dialog.visible = false;
-      form.value.type = "1"
-      search.value.type = "1"
+      form.value.type = "1";
+      search.value.type = "1";
       dataList();
     } else {
       ElMessage.error(data.msg);
@@ -503,7 +497,7 @@ option.value = Object.assign(option.value, {
       overHidden: true,
       prop: "operationType",
       search: true,
-      type: 'select',
+      type: "select",
       dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.process_type,
       props: {
         label: "dictLabel",
@@ -522,7 +516,11 @@ option.value = Object.assign(option.value, {
   ],
 });
 const handleExport = () => {
-  exportOperationRecord({...search.value,operationType: clickOperationType.value,type: 1}).then((response) => {
+  exportOperationRecord({
+    ...search.value,
+    operationType: clickOperationType.value,
+    type: 1,
+  }).then((response) => {
     try {
       const decoder = new TextDecoder("utf-8");
       const jsonString = decoder.decode(response.data);
@@ -554,10 +552,10 @@ const handleExport1 = () => {
 const downFile = (response) => {
   const fileData = response.data;
   const fileName = decodeURI(
-      response.headers["content-disposition"].split(";")[1].split("=")[1]
+    response.headers["content-disposition"].split(";")[1].split("=")[1]
   );
   const fileType =
-      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
+    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
   const blob = new Blob([fileData], { type: fileType });
   const downloadUrl = window.URL.createObjectURL(blob);
   const downloadLink = document.createElement("a");
@@ -569,16 +567,16 @@ const downFile = (response) => {
   window.URL.revokeObjectURL(downloadUrl);
 };
 onMounted(() => {
-  form.value.type = "1"
-  search.value.type = "1"
+  form.value.type = "1";
+  search.value.type = "1";
   const now = new Date();
   const year = now.getFullYear();
   let month = now.getMonth() + 1; // 从0开始的月份
   // 当月结束日期
   const daysInMonth = new Date(year, now.getMonth() + 1, 0).getDate();
   month = month.toLocaleString().length === 1 ? "0" + month : month;
-  search.value.startDate = year + "-" + month + "-" + "01"
-  search.value.endDate = year + "-" + month + "-" + daysInMonth
+  search.value.startDate = year + "-" + month + "-" + "01";
+  search.value.endDate = year + "-" + month + "-" + daysInMonth;
   dataList();
 });
 </script>