瀏覽代碼

流转卡号替换成WIN码。

jiaxiaoqiang 4 月之前
父節點
當前提交
250ab49abe

+ 97 - 107
src/views/plan/finishProduct/components/detail-stock.vue

@@ -1,5 +1,4 @@
 <template>
-
   <div class="mainContentBox">
     <avue-crud
       ref="crudRef"
@@ -14,118 +13,109 @@
       @search-change="searchChange"
       @search-reset="resetChange"
       @selection-change="selectionChange"
-    >
-
-
-
-    </avue-crud>
-
+    />
   </div>
-
-
-
 </template>
 <script setup lang="ts">
-  import { ref, getCurrentInstance } from "vue";
-  import { useCrud } from "@/hooks/userCrud";
-  import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook, useDictionaryStore } from "@/store";
-  const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import {addStock} from "@/api/inStock"
-  import dictDataUtil from "@/common/configs/dictDataUtil";
-  // 数据字典相关
-
-  const test = () => {
-    isShowTable.value = true;
-    tableType.value = tableType.value == 1 ? 2 : 1;
-  };
-  const props = defineProps({
-    workOrderCode: {
-      type: String,
-      default: () => {
-        return 0;
-      }
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import ButtonPermKeys from "@/common/configs/buttonPermission";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
+const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+import { addStock } from "@/api/inStock";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+// 数据字典相关
+
+const test = () => {
+  isShowTable.value = true;
+  tableType.value = tableType.value == 1 ? 2 : 1;
+};
+const props = defineProps({
+  workOrderCode: {
+    type: String,
+    default: () => {
+      return 0;
     },
-    dialog:{
-      type:Object,
-      default:()=>{
-        return {};
-      }
-    }
-
-  })
-  const crudRef=ref(null);
-  // 传入一个url,后面不带/
-  const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
-    useCrud({
-      src: "/api/v1/plan/seq/in/stock",
-    });
-  const { dataNoPageList, createRow, updateRow, deleteRow, searchChange, resetChange } =
-    Methords; //增删改查
-  const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
-  const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-  // checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
-  // const permission = reactive({
-  //   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
-  //   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
-  //   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
-  //   menu: true,
-  // });
-
-
-
-
-
-  onMounted(() => {
-    search.value.workOrderCode=props.workOrderCode;
-    dataNoPageList();
-
-
-  });
-
-
-  // 设置表格列或者其他自定义的option
-  option.value = Object.assign(option.value, {
-    selection: true,
-    addBtn: false,
-    editBtn:false,
-    delBtn:false,
-    viewBtn:false,
-    menu:false,
-    columnBtn: false,
-    gridBtn: false,
-    column: [
-      {
-        label: "接收人",
-        prop: "recipient",
-      },
-      {
-        label: "入库数量",
-        prop: "inventoryNum",
-      },
-      {
-        label: "流转卡号",
-        prop: "seqNo",
-        overHidden: true,
-      },
-      {
-        label: "备注",
-        prop: "remark",
-        overHidden: true,
-      },
-      {
-        label: "创建人",
-        prop: "creator",
-      },
-      {
-        label: "创建时间",
-        prop: "created",
-      },
-    ],
+  },
+  dialog: {
+    type: Object,
+    default: () => {
+      return {};
+    },
+  },
+});
+const crudRef = ref(null);
+// 传入一个url,后面不带/
+const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+  useCrud({
+    src: "/api/v1/plan/seq/in/stock",
   });
-
+const {
+  dataNoPageList,
+  createRow,
+  updateRow,
+  deleteRow,
+  searchChange,
+  resetChange,
+} = Methords; //增删改查
+const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
+const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
+// checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
+// const permission = reactive({
+//   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
+//   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
+//   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
+//   menu: true,
+// });
+
+onMounted(() => {
+  search.value.workOrderCode = props.workOrderCode;
+  dataNoPageList();
+});
+
+// 设置表格列或者其他自定义的option
+option.value = Object.assign(option.value, {
+  selection: true,
+  addBtn: false,
+  editBtn: false,
+  delBtn: false,
+  viewBtn: false,
+  menu: false,
+  columnBtn: false,
+  gridBtn: false,
+  column: [
+    {
+      label: "接收人",
+      prop: "recipient",
+    },
+    {
+      label: "入库数量",
+      prop: "inventoryNum",
+    },
+    {
+      label: "WIN码",
+      prop: "seqNo",
+      overHidden: true,
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      overHidden: true,
+    },
+    {
+      label: "创建人",
+      prop: "creator",
+    },
+    {
+      label: "创建时间",
+      prop: "created",
+    },
+  ],
+});
 </script>
 
 <style>
-  .avue-crud__header{min-height: 0px;}
+.avue-crud__header {
+  min-height: 0px;
+}
 </style>

+ 2 - 2
src/views/plan/finishProduct/components/in-stock.vue

@@ -100,7 +100,7 @@ const onHandle = () => {
   }
   if (seqList.value.length == 0) {
     ElMessage({
-      message: "未选择要入库的流转卡号",
+      message: "未选择要入库的WIN码",
       type: "error",
     });
     return false;
@@ -156,7 +156,7 @@ option.value = Object.assign(option.value, {
   gridBtn: false,
   column: [
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
     },
   ],

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

@@ -16,7 +16,7 @@
       @current-change="dataList"
       @selection-change="selectionChange"
     >
-<!--      <template #menu="{ size, row, index }">
+      <!--      <template #menu="{ size, row, index }">
         <el-button
           icon="el-icon-edit"
           text
@@ -162,7 +162,7 @@ option.value = Object.assign(option.value, {
   delBtn: false,
   column: [
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
       editDisabled: true,
       search: true,

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

@@ -1,49 +1,60 @@
 <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="createRow"
-        @row-update="updateRow"
-        @row-del="deleteRow"
-        @search-change="searchChange"
-        @search-reset="resetChange"
-        @size-change="dataList"
-        @current-change="dataList"
-        @selection-change="selectionChange1"
+      ref="crudRef"
+      v-model:search="search"
+      v-model="form"
+      :data="data"
+      :option="option"
+      v-model:page="page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange1"
     >
       <template #menu-left="{}">
         <el-button
-          v-if ="info.workOrderState  === '1' || info.workOrderState  === '2' || info.workOrderState  === '0'"
+          v-if="
+            info.workOrderState === '1' ||
+            info.workOrderState === '2' ||
+            info.workOrderState === '0'
+          "
           type="primary"
           icon="el-icon-plus"
           @click="addObj"
-        >新增</el-button>
+          >新增</el-button
+        >
 
         <el-button
-          v-if ="info.workOrderState  === '1' || info.workOrderState  === '2' || info.workOrderState  === '0'"
+          v-if="
+            info.workOrderState === '1' ||
+            info.workOrderState === '2' ||
+            info.workOrderState === '0'
+          "
           :disabled="toDeleteIds.length < 1"
           type="danger"
           icon="el-icon-delete"
           @click="multipleDelete"
-        >删除</el-button>
+          >删除</el-button
+        >
         <el-button
-            :disabled="toDeleteIds.length < 1"
-            class="ml-3"
-            @click="printCode">打印
+          :disabled="toDeleteIds.length < 1"
+          class="ml-3"
+          @click="printCode"
+          >打印
         </el-button>
       </template>
       <template #menu-right="{}">
         <el-dropdown split-button
-        >导入
+          >导入
           <template #dropdown>
             <el-dropdown-menu>
               <el-dropdown-item
-                  @click="downloadTemplate('/api/v1/plan/seq/template')"
+                @click="downloadTemplate('/api/v1/plan/seq/template')"
               >
                 <i-ep-download />下载模板
               </el-dropdown-item>
@@ -53,41 +64,43 @@
             </el-dropdown-menu>
           </template>
         </el-dropdown>
-        <el-button
-            class="ml-3"
-            @click="exportData('/api/v1/plan/seq/export')"
-        >
+        <el-button class="ml-3" @click="exportData('/api/v1/plan/seq/export')">
           <template #icon> <i-ep-download /> </template>导出
         </el-button>
       </template>
-
     </avue-crud>
     <el-dialog
-        v-model="dialog.visible"
-        :title="dialog.title"
-        width="1250px"
-        @close="dialog.visible = false"
+      v-model="dialog.visible"
+      :title="dialog.title"
+      width="1250px"
+      @close="dialog.visible = false"
     >
-      <div style="display: flex;flex-wrap: wrap;" ref="toPrintRef">
-        <div v-for="item of clickObjs" style="width: 238px;height:325px;font-size:10px;">
-          <vue-qrcode  :value="item.seqNo"  size="45" error-level="H"></vue-qrcode>
+      <div style="display: flex; flex-wrap: wrap" ref="toPrintRef">
+        <div
+          v-for="item of clickObjs"
+          style="width: 238px; height: 325px; font-size: 10px"
+        >
+          <vue-qrcode :value="item.seqNo" size="45" error-level="H" />
           <div>
-            <el-text>{{item.seqNo}}</el-text>
+            <el-text>{{ item.seqNo }}</el-text>
           </div>
           <div>
-            <el-text>工单号:</el-text><el-text>{{info.workOrderCode}}</el-text>
+            <el-text>工单号:</el-text
+            ><el-text>{{ info.workOrderCode }}</el-text>
           </div>
           <div>
-            <el-text>计划单号:</el-text><el-text>{{info.orderCode}}</el-text>
+            <el-text>计划单号:</el-text><el-text>{{ info.orderCode }}</el-text>
           </div>
           <div>
-            <el-text>物料号:</el-text><el-text>{{info.materialCode}}</el-text>
+            <el-text>物料号:</el-text><el-text>{{ info.materialCode }}</el-text>
           </div>
           <div>
-            <el-text>物料名称:</el-text><el-text>{{info.materialName}}</el-text>
+            <el-text>物料名称:</el-text
+            ><el-text>{{ info.materialName }}</el-text>
           </div>
           <div>
-            <el-text>物料型号:</el-text><el-text>{{info.materialModel}}</el-text>
+            <el-text>物料型号:</el-text
+            ><el-text>{{ info.materialModel }}</el-text>
           </div>
         </div>
       </div>
@@ -100,7 +113,7 @@
   </div>
 </template>
 <script setup>
-import {defineProps, ref} from "vue";
+import { defineProps, ref } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
@@ -111,57 +124,57 @@ const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
-const info = ref({})
+const info = ref({});
 const props = defineProps({
   workOrderInfo: {
     type: Object,
     default: () => {
       return null;
-    }
-  }
-})
-const printPage = ()=>{
+    },
+  },
+});
+const printPage = () => {
   html2CanvasPrint(toPrintRef.value);
-}
+};
 const dialog = reactive({
   title: "二维码打印",
   visible: false,
 });
-const clickObjs = ref([])
-const selectionChange1 =(row)=>{
+const clickObjs = ref([]);
+const selectionChange1 = (row) => {
   toDeleteIds.value = [];
   row?.forEach((element) => {
     toDeleteIds.value.push(element.id);
   });
-  clickObjs.value = row
-}
+  clickObjs.value = row;
+};
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
-const addObj =()=>{
-  form.value.workOrderCode = props.workOrderInfo.workOrderCode
+const addObj = () => {
+  form.value.workOrderCode = props.workOrderInfo.workOrderCode;
   crudRef.value && crudRef.value.rowAdd();
-}
+};
 watch(
-    () => props.workOrderInfo,
-    () => {
-      form.value.workOrderCode = props.workOrderInfo.workOrderCode
-      info.value = props.workOrderInfo
-      search.value.workOrderCode = props.workOrderInfo.workOrderCode
-      dataList();
-    }
+  () => props.workOrderInfo,
+  () => {
+    form.value.workOrderCode = props.workOrderInfo.workOrderCode;
+    info.value = props.workOrderInfo;
+    search.value.workOrderCode = props.workOrderInfo.workOrderCode;
+    dataList();
+  }
 );
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/plan/seq",
   });
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
 
-const printCode = () =>{
-  dialog.visible = true
-}
-
+const printCode = () => {
+  dialog.visible = true;
+};
 
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
@@ -176,7 +189,7 @@ option.value = Object.assign(option.value, {
   menu: false,
   column: [
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
       width: 220,
       search: true,
@@ -184,7 +197,7 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "流转卡号不能为空",
+          message: "WIN码不能为空",
           trigger: "trigger",
         },
       ],
@@ -209,20 +222,19 @@ option.value = Object.assign(option.value, {
       display: false,
       type: "select",
       dicUrl:
-          dictDataUtil.request_url +
-          dictDataUtil.TYPE_CODE.work_order_seq_state,
+        dictDataUtil.request_url + dictDataUtil.TYPE_CODE.work_order_seq_state,
       props: {
         label: "dictLabel",
         value: "dictValue",
-      }
+      },
     },
   ],
 });
 
 onMounted(() => {
-  info.value = props.workOrderInfo
-  form.value.workOrderCode = props.workOrderInfo.workOrderCode
-  search.value.workOrderCode = props.workOrderInfo.workOrderCode
+  info.value = props.workOrderInfo;
+  form.value.workOrderCode = props.workOrderInfo.workOrderCode;
+  search.value.workOrderCode = props.workOrderInfo.workOrderCode;
   dataList();
 });
 /**
@@ -236,7 +248,9 @@ const uploadFinished = () => {
 };
 const importExcelData = () => {
   if (uploadRef.value) {
-    uploadRef.value.show("/api/v1/plan/seq/import","流转号导入",{workOrderCode: search.value.workOrderCode});
+    uploadRef.value.show("/api/v1/plan/seq/import", "流转号导入", {
+      workOrderCode: search.value.workOrderCode,
+    });
   }
 };
 </script>

+ 3 - 3
src/views/plan/workOrder/index.vue

@@ -100,7 +100,7 @@
           @click="showSeqPage(row)"
           type="primary"
           :size="size"
-          >流转卡号</el-button
+          >WIN码</el-button
         >
         <el-button
           icon="el-icon-delete"
@@ -111,7 +111,7 @@
           :size="size"
           >撤销</el-button
         >
-<!--        <el-button
+        <!--        <el-button
           icon="el-icon-setting"
           text
           @click="showCheckTask(row)"
@@ -372,7 +372,7 @@ const dialog3 = reactive({
   visible: false,
 });
 const dialog4 = reactive({
-  title: "流转卡号",
+  title: "WIN码",
   visible: false,
 });
 const dialog5 = reactive({

+ 23 - 16
src/views/pro/traceability/index.vue

@@ -33,7 +33,7 @@
             <el-descriptions-item label="产品名称">{{
               productReviewInfo.materialName
             }}</el-descriptions-item>
-            <el-descriptions-item label="流转卡号">{{
+            <el-descriptions-item label="WIN码">{{
               productReviewInfo.seqNo
             }}</el-descriptions-item>
             <el-descriptions-item label="物料编号">{{
@@ -44,7 +44,7 @@
             }}</el-descriptions-item>
             <el-descriptions-item label="铭牌号">-</el-descriptions-item>
             <el-descriptions-item label="是否返工">
-              <el-tag size="small">{{productReviewInfo.rework}}</el-tag>
+              <el-tag size="small">{{ productReviewInfo.rework }}</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="工单出站">{{
               productReviewInfo.outNum
@@ -52,7 +52,11 @@
             <el-descriptions-item label="交付日期">{{
               productReviewInfo.planStartEnd
             }}</el-descriptions-item>
-            <el-descriptions-item label="工单报故"><el-tag size="small">{{productReviewInfo.bug}}</el-tag></el-descriptions-item>
+            <el-descriptions-item label="工单报故"
+              ><el-tag size="small">{{
+                productReviewInfo.bug
+              }}</el-tag></el-descriptions-item
+            >
           </el-descriptions>
         </el-header>
         <el-main>
@@ -87,7 +91,7 @@
               </template>
               <MaterialsCom ref="materialsComRef" />
             </el-tab-pane>
-<!--            <el-tab-pane name="recordComRef" label="记录项">
+            <!--            <el-tab-pane name="recordComRef" label="记录项">
               <template #label>
                 <span
                   >记录项
@@ -232,7 +236,7 @@ const chooseTagType = (row, type) => {
   let daynamicType = "";
   if (type == "text") {
     daynamicType =
-      row === "order" ? "订单" : row === "workOrder" ? "工单" : "流转卡号";
+      row === "order" ? "订单" : row === "workOrder" ? "工单" : "WIN码";
   } else {
     daynamicType =
       row === "order" ? "success" : row === "workOrder" ? "warning" : "primary";
@@ -248,8 +252,8 @@ let productReviewInfo = reactive({
   planStartEnd: "",
   workOrderCode: "",
   outNum: "",
-  rework: '-',
-  bug: '-'
+  rework: "-",
+  bug: "-",
 });
 
 let tabCount = reactive({
@@ -264,11 +268,11 @@ let tabCount = reactive({
 });
 
 const handleCellClick = (row, column, event) => {
-  if(row.level === 'order'){
-    productReviewInfo.bug = '-'
+  if (row.level === "order") {
+    productReviewInfo.bug = "-";
   }
-  if(row.orderType){
-    productReviewInfo.rework = row.orderType === '2' ? '是' : '否'
+  if (row.orderType) {
+    productReviewInfo.rework = row.orderType === "2" ? "是" : "否";
   }
   //获取出单的数量
   if (data.value) {
@@ -276,8 +280,8 @@ const handleCellClick = (row, column, event) => {
       if (topTree) {
         for (let secondTree of topTree.children) {
           if (row.workOrderCode == secondTree.workOrderCode) {
-            productReviewInfo.rework = topTree.orderType === '2' ? '是' : '否'
-            productReviewInfo.bug = secondTree.bugNum === 0 ? '否' : '是'
+            productReviewInfo.rework = topTree.orderType === "2" ? "是" : "否";
+            productReviewInfo.bug = secondTree.bugNum === 0 ? "否" : "是";
             productReviewInfo.outNum = secondTree.children.length;
           }
         }
@@ -293,7 +297,10 @@ const handleCellClick = (row, column, event) => {
       tabNameComRef.get(defaultTabName.value)?.value.refreshTra(temRow.value);
     }
     //每次点击都要获取tab页面的数量
-    traceabilityTabCount({ seqNo: row.seqNo,workOrderCode: row.workOrderCode }).then(({ data }) => {
+    traceabilityTabCount({
+      seqNo: row.seqNo,
+      workOrderCode: row.workOrderCode,
+    }).then(({ data }) => {
       tabCount = Object.assign(tabCount, data);
     });
     if (row.workOrderCode == productReviewInfo.workOrderCode) {
@@ -301,7 +308,7 @@ const handleCellClick = (row, column, event) => {
       return;
     }
     //产品信息
-    getMaterialDetailsByseqNo(row.workOrderCode,row.seqNo).then(({ data }) => {
+    getMaterialDetailsByseqNo(row.workOrderCode, row.seqNo).then(({ data }) => {
       productReviewInfo = Object.assign(productReviewInfo, data);
       productReviewInfo.workOrderCode = row.workOrderCode;
       // productReviewInfo.outNum =
@@ -334,7 +341,7 @@ option.value = Object.assign(option.value, {
       hide: true,
     },
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
       search: true,
       searchLabelWidth: "100",

+ 5 - 5
src/views/produce/dispatch/index.vue

@@ -26,7 +26,7 @@
           :size="size"
           >编辑</el-button
         >
-<!--        <el-button
+        <!--        <el-button
           icon="el-icon-right"
           text
           v-if="row.state === '-1' || row.state === '0' || row.state === '1'"
@@ -71,7 +71,7 @@ const shopList = ref([]);
 const userList = ref([]);
 const charts = shallowRef(null);
 const handleEdit = (row, index) => {
-/*  queryStationByLineId(row.productLineId).then((data) => {
+  /*  queryStationByLineId(row.productLineId).then((data) => {
     stationList.value = data.data;
   });*/
 
@@ -164,12 +164,12 @@ option.value = Object.assign(option.value, {
   delBtn: false,
   column: [
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
       editDisabled: true,
       search: true,
     },
-   /* {
+    /* {
       label: "工位名称",
       prop: "stationName",
       search: true,
@@ -209,7 +209,7 @@ option.value = Object.assign(option.value, {
       width: 125,
       editDisabled: true,
     },
-   /* {
+    /* {
       label: "产线名称",
       prop: "productLineName",
       editDisabled: true,

+ 216 - 197
src/views/quality/faultHandle/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="mainContentBox">
-
-
     <avue-crud
       ref="crudRef"
       v-model:search="search"
@@ -19,42 +17,52 @@
       @selection-change="selectionChange"
     >
       <template #menu-left>
-        <el-radio-group v-model="radio1" size="large" @change="searchChangeState">
+        <el-radio-group
+          v-model="radio1"
+          size="large"
+          @change="searchChangeState"
+        >
           <el-radio-button label="未完成" value="1" />
           <el-radio-button label="已完成" value="3" />
         </el-radio-group>
-       </template>
-      <template #menu="{row,index,type}">
-        <el-button @click="viewFault(row)"
-                   icon="el-icon-view"
-                   text
-                   type="primary"
-        >查看</el-button>
-        <el-button @click="faultEdit(row)"
-                   icon="el-icon-link"
-                   text
-                   type="primary"
-                   v-if="row.currentState==6"
-                   v-hasPerm="[ButtonPermKeys.FAULT.BTNS.faultHandle_handle]"
-        >处理</el-button>
-
-        <el-button @click="faultThaw(row)"
-                   icon="el-icon-open"
-                   text
-                   type="primary"
-                   v-hasPerm="[ButtonPermKeys.FAULT.BTNS.faultHandle_thaw]"
-                   v-if="row.currentState==4"
-        >解冻</el-button>
-        <el-button @click="faultExamine(row)"
-                   icon="el-icon-reading"
-                   text
-                   type="primary"
-                   v-hasPerm="[ButtonPermKeys.FAULT.BTNS.faultHandle_examine]"
-                   v-if="row.currentState==1"
-        >审核</el-button>
       </template>
+      <template #menu="{ row, index, type }">
+        <el-button
+          @click="viewFault(row)"
+          icon="el-icon-view"
+          text
+          type="primary"
+          >查看</el-button
+        >
+        <el-button
+          @click="faultEdit(row)"
+          icon="el-icon-link"
+          text
+          type="primary"
+          v-if="row.currentState == 6"
+          v-hasPerm="[ButtonPermKeys.FAULT.BTNS.faultHandle_handle]"
+          >处理</el-button
+        >
 
-
+        <el-button
+          @click="faultThaw(row)"
+          icon="el-icon-open"
+          text
+          type="primary"
+          v-hasPerm="[ButtonPermKeys.FAULT.BTNS.faultHandle_thaw]"
+          v-if="row.currentState == 4"
+          >解冻</el-button
+        >
+        <el-button
+          @click="faultExamine(row)"
+          icon="el-icon-reading"
+          text
+          type="primary"
+          v-hasPerm="[ButtonPermKeys.FAULT.BTNS.faultHandle_examine]"
+          v-if="row.currentState == 1"
+          >审核</el-button
+        >
+      </template>
     </avue-crud>
 
     <el-dialog
@@ -64,7 +72,7 @@
       @close="dialog.visible = false"
       :destroy-on-close="true"
     >
-      <fault-detail  :escalationFaultId="fault.id" :dialog="dialog" />
+      <fault-detail :escalationFaultId="fault.id" :dialog="dialog" />
     </el-dialog>
 
     <el-dialog
@@ -74,7 +82,7 @@
       @close="closeFaultDetail"
       :destroy-on-close="true"
     >
-      <fault-handle  :escalationId="faultInfo.id" :dia="dialog1" />
+      <fault-handle :escalationId="faultInfo.id" :dia="dialog1" />
     </el-dialog>
 
     <el-dialog
@@ -84,7 +92,11 @@
       @close="closeFaultHandel"
       :destroy-on-close="true"
     >
-      <fault-page  :faultId="faultEs.id" :dial="dialog2" :workOrderCode="faultEs.workOrderCode"/>
+      <fault-page
+        :faultId="faultEs.id"
+        :dial="dialog2"
+        :workOrderCode="faultEs.workOrderCode"
+      />
     </el-dialog>
 
     <el-dialog
@@ -94,180 +106,187 @@
       @close="closeFault"
       :destroy-on-close="true"
     >
-      <FaultExamine  :escFaultId="faultExa.id" :dialogPs="dialog3" />
+      <FaultExamine :escFaultId="faultExa.id" :dialogPs="dialog3" />
     </el-dialog>
   </div>
 </template>
 <script setup>
-  import { ref, getCurrentInstance } from "vue";
-  import { useCrud } from "@/hooks/userCrud";
-  import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import dictDataUtil from "@/common/configs/dictDataUtil";
-  import { useCommonStoreHook, useDictionaryStore } from "@/store";
-  import FaultExamine from "@/views/quality/faultHandle/components/fault-examine.vue"
-  const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  // 数据字典相关
-  const { dicts } = useDictionaryStore();
-
-  const test = () => {
-    isShowTable.value = true;
-    tableType.value = tableType.value == 1 ? 2 : 1;
-  };
-  const dialog = ref({
-    title: "报故详情",
-    visible: false,
-  });
-  const dialog1 = ref({
-    title: "报故处理",
-    visible: false,
-  });
-  const dialog2 = ref({
-    title: "解冻",
-    visible: false,
-  });
-  const dialog3 = ref({
-    title: "审核",
-    visible: false,
-  });
-
-  const closeFaultDetail=()=>{
-    dialog1.visible = false;
-    dataList();
-  }
-  const closeFaultHandel=()=>{
-    dialog2.visible = false;
-    dataList();
-  }
-  const fault=ref({});
-  const faultInfo=ref({});
-  const faultEs=ref({});
-  const faultExa=ref({});
-  const faultEdit=(row)=>{
-
-    faultInfo.value.id=row.id;
-
-    dialog1.value.visible=true;
-  }
-  const faultThaw=(row)=>{
-    faultEs.value=row;
-    dialog2.value.visible=true;
-  }
-
-  const faultExamine =(row)=>{
-    faultExa.value.id=row.id;
-    dialog3.value.visible=true;
-  }
-  const closeFault=()=>{
-    dialog3.value.visible=false;
-    dataList();
-  }
-  // 传入一个url,后面不带/
-  const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
-    useCrud({
-      src: "/api/v1/process/escalationFault",
-    });
-  const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
-    Methords; //增删改查
-  const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
-  const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-  // checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
-  // const permission = reactive({
-  //   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
-  //   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
-  //   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
-  //   menu: true,
-  // });
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import ButtonPermKeys from "@/common/configs/buttonPermission";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
+import FaultExamine from "@/views/quality/faultHandle/components/fault-examine.vue";
+const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+// 数据字典相关
+const { dicts } = useDictionaryStore();
 
-  const crudRef = ref(null); //crudRef.value 获取avue-crud对象
-  const router = useRouter();
-  const route = useRoute();
-  const viewFault = (row) => {
+const test = () => {
+  isShowTable.value = true;
+  tableType.value = tableType.value == 1 ? 2 : 1;
+};
+const dialog = ref({
+  title: "报故详情",
+  visible: false,
+});
+const dialog1 = ref({
+  title: "报故处理",
+  visible: false,
+});
+const dialog2 = ref({
+  title: "解冻",
+  visible: false,
+});
+const dialog3 = ref({
+  title: "审核",
+  visible: false,
+});
 
-    fault.value.id=row.id;
-    console.info(fault)
-    dialog.value.visible=true;
-  };
-  onMounted(() => {
-    // console.log("crudRef", crudRef)
+const closeFaultDetail = () => {
+  dialog1.value.visible = false;
+  dataList();
+};
+const closeFaultHandel = () => {
+  dialog2.value.visible = false;
+  dataList();
+};
+const fault = ref({});
+const faultInfo = ref({});
+const faultEs = ref({});
+const faultExa = ref({});
+const faultEdit = (row) => {
+  faultInfo.value.id = row.id;
 
-    search.value.id = route.query.id;
-    search.value.state = radio1.value;
-    dataList();
+  dialog1.value.visible = true;
+};
+const faultThaw = (row) => {
+  faultEs.value = row;
+  dialog2.value.visible = true;
+};
 
+const faultExamine = (row) => {
+  faultExa.value.id = row.id;
+  dialog3.value.visible = true;
+};
+const closeFault = () => {
+  dialog3.value.visible = false;
+  dataList();
+};
+// 传入一个url,后面不带/
+const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+  useCrud({
+    src: "/api/v1/process/escalationFault",
   });
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  Methords; //增删改查
+const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
+const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
+// checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
+// const permission = reactive({
+//   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
+//   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
+//   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
+//   menu: true,
+// });
 
-  const searchChangeState=()=>{
-    search.value.state=radio1.value;
-    dataList();
-  }
+const crudRef = ref(null); //crudRef.value 获取avue-crud对象
+const router = useRouter();
+const route = useRoute();
+const viewFault = (row) => {
+  fault.value.id = row.id;
+  console.info(fault);
+  dialog.value.visible = true;
+};
+onMounted(() => {
+  // console.log("crudRef", crudRef)
 
-  const radio1 = ref('1')
+  search.value.id = route.query.id;
+  search.value.state = radio1.value;
+  dataList();
+});
 
-  // 设置表格列或者其他自定义的option
-  option.value = Object.assign(option.value, {
-    addBtn: false,
-    editBtn:false,
-    delBtn:false,
-    viewBtn:false,
-    column: [
+const searchChangeState = () => {
+  search.value.state = radio1.value;
+  dataList();
+};
 
-      {
-        label: "审理单号",
-        prop: "trackingNumber",
-        overHidden: true,
-        search: true,
-      },
-      {
-        label: "工单号",
-        prop: "workOrderCode",
-        overHidden: true,
-        search: true,
-      },
-      {
-        label: "订单号",
-        prop: "orderCode",
-        overHidden: true,
-        width:120,
-        search: true,
-      },
-      {
-        label: "不合格数量",
-        overHidden: true,
-        width:100,
-        prop: "unqualifiedNum",
-      },
-      {
-        label: "产品编码", prop: "materialCode", overHidden: true,
-
-      },
-      {
-        label: "产品名称", prop: "materialName", overHidden: true,
-        width:100,
-      },
-
-      {
-        label: "流转卡号", prop: "seqNo", overHidden: true,search:true,
-      },
-      {
-        label: "状态", prop: "state", overHidden: true,
-        width:120,
-        dicUrl:dictDataUtil.request_url + dictDataUtil.TYPE_CODE.escalation_fault_state,
-        props: { label: "dictLabel", value: "dictValue" },
-      },
-      {
-        label: "跟踪状态", prop: "currentState", overHidden: true,
-        width:100,
-        dicUrl:dictDataUtil.request_url + dictDataUtil.TYPE_CODE.fault_current_state,
-        props: { label: "dictLabel", value: "dictValue" },
-      },
-      {
-        label: "报故人", prop: "creator",
-        overHidden: true,
-        width:100,
-      },
-
-    ],
-  });
+const radio1 = ref("1");
 
+// 设置表格列或者其他自定义的option
+option.value = Object.assign(option.value, {
+  addBtn: false,
+  editBtn: false,
+  delBtn: false,
+  viewBtn: false,
+  column: [
+    {
+      label: "审理单号",
+      prop: "trackingNumber",
+      overHidden: true,
+      search: true,
+    },
+    {
+      label: "工单号",
+      prop: "workOrderCode",
+      overHidden: true,
+      search: true,
+    },
+    {
+      label: "订单号",
+      prop: "orderCode",
+      overHidden: true,
+      width: 120,
+      search: true,
+    },
+    {
+      label: "不合格数量",
+      overHidden: true,
+      width: 100,
+      prop: "unqualifiedNum",
+    },
+    {
+      label: "产品编码",
+      prop: "materialCode",
+      overHidden: true,
+    },
+    {
+      label: "产品名称",
+      prop: "materialName",
+      overHidden: true,
+      width: 100,
+    },
 
+    {
+      label: "WIN码",
+      prop: "seqNo",
+      overHidden: true,
+      search: true,
+    },
+    {
+      label: "状态",
+      prop: "state",
+      overHidden: true,
+      width: 120,
+      dicUrl:
+        dictDataUtil.request_url +
+        dictDataUtil.TYPE_CODE.escalation_fault_state,
+      props: { label: "dictLabel", value: "dictValue" },
+    },
+    {
+      label: "跟踪状态",
+      prop: "currentState",
+      overHidden: true,
+      width: 100,
+      dicUrl:
+        dictDataUtil.request_url + dictDataUtil.TYPE_CODE.fault_current_state,
+      props: { label: "dictLabel", value: "dictValue" },
+    },
+    {
+      label: "报故人",
+      prop: "creator",
+      overHidden: true,
+      width: 100,
+    },
+  ],
+});
 </script>

+ 116 - 110
src/views/quality/outsource/index.vue

@@ -1,87 +1,90 @@
 <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="createRow"
-        @row-update="updateRow"
-        @row-del="deleteRow"
-        @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="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
     >
-      <template #menu="{size,row,index}">
-<!--        <el-button
+      <template #menu="{ size, row, index }">
+        <!--        <el-button
             icon="el-icon-delete"
             text
             @click="deleteRow(row)"
             type="danger"
             :size="size">删除</el-button>-->
         <el-button
-            icon="el-icon-edit"
-            text
-            v-if="row.state === '0'"
-            @click="openDialog(1,row.id)"
-            type="primary"
-            :size="size">审核</el-button>
+          icon="el-icon-edit"
+          text
+          v-if="row.state === '0'"
+          @click="openDialog(1, row.id)"
+          type="primary"
+          :size="size"
+          >审核</el-button
+        >
 
         <el-button
-            icon="el-icon-edit"
-            text
-            @click="openDialog(0,row.id)"
-            type="primary"
-            :size="size">详情</el-button>
+          icon="el-icon-edit"
+          text
+          @click="openDialog(0, row.id)"
+          type="primary"
+          :size="size"
+          >详情</el-button
+        >
       </template>
     </avue-crud>
     <el-dialog
-        v-model="dialog.visible"
-        :title="dialog.title"
-        width="950px"
-        @close="dialog.visible = false"
+      v-model="dialog.visible"
+      :title="dialog.title"
+      width="950px"
+      @close="dialog.visible = false"
     >
-
-      <el-form ref="queryFormRef"  label-width="100" :inline="true">
+      <el-form ref="queryFormRef" label-width="100" :inline="true">
         <el-row :gutter="24">
           <el-col :lg="10" :xs="24">
             <el-form-item label="订单编码">
-              <el-text>{{form.orderCode}}</el-text>
+              <el-text>{{ form.orderCode }}</el-text>
             </el-form-item>
           </el-col>
 
           <el-col :lg="6" :xs="24">
             <el-form-item label="订单名称">
-              <el-text>{{form.orderName}}</el-text>
+              <el-text>{{ form.orderName }}</el-text>
             </el-form-item>
           </el-col>
 
           <el-col :lg="2" :xs="24">
             <el-form-item label="工单编码">
-              <el-text>{{form.workOrderCode}}</el-text>
+              <el-text>{{ form.workOrderCode }}</el-text>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :lg="10" :xs="24">
             <el-form-item label="产品名称">
-              <el-text>{{form.materialName}}</el-text>
+              <el-text>{{ form.materialName }}</el-text>
             </el-form-item>
           </el-col>
 
           <el-col :lg="6" :xs="24">
             <el-form-item label="产品编码">
-              <el-text>{{form.materialCode}}</el-text>
+              <el-text>{{ form.materialCode }}</el-text>
             </el-form-item>
           </el-col>
 
           <el-col :lg="2" :xs="24">
             <el-form-item label="产品数量">
-              <el-text>{{form.outNum}}</el-text>
+              <el-text>{{ form.outNum }}</el-text>
             </el-form-item>
           </el-col>
         </el-row>
@@ -89,32 +92,32 @@
         <el-row :gutter="24">
           <el-col :lg="24" :xs="24">
             <el-form-item label=" ">
-              <el-table border=true
-                  class="gray-header-table"
-                  v-loading="loading"
-                  :data="form.details"
-                  highlight-current-row>
+              <el-table
+                border="true"
+                class="gray-header-table"
+                v-loading="loading"
+                :data="form.details"
+                highlight-current-row
+              >
                 <el-table-column
-                    label="流转卡号"
-                    align="left"
-                    width=350
-                    prop="seqNo"
+                  label="WIN码"
+                  align="left"
+                  width="350"
+                  prop="seqNo"
                 />
                 <el-table-column
-                    label="状态"
-                    width=250
-                    align="left"
-                    prop="state"
+                  label="状态"
+                  width="250"
+                  align="left"
+                  prop="state"
                 >
                   <template #default="scope">
-                    <el-tag
-                        v-if="scope.row.state === 0"
-                        type="success"
-                    >合格</el-tag>
-                    <el-tag
-                        v-if="scope.row.state === 1"
-                        type="error"
-                    >不合格</el-tag>
+                    <el-tag v-if="scope.row.state === 0" type="success"
+                      >合格</el-tag
+                    >
+                    <el-tag v-if="scope.row.state === 1" type="error"
+                      >不合格</el-tag
+                    >
                   </template>
                 </el-table-column>
               </el-table>
@@ -124,49 +127,53 @@
         <el-row :gutter="24">
           <el-col :lg="24" :xs="24">
             <el-form-item label="委外工序">
-              <el-text>{{form.operationNames}}</el-text>
+              <el-text>{{ form.operationNames }}</el-text>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
-        <el-col :lg="24" :xs="24">
-          <el-form-item label="委外供应商">
-            <el-text>{{form.manufacturers}}</el-text>
-          </el-form-item>
-        </el-col>
+          <el-col :lg="24" :xs="24">
+            <el-form-item label="委外供应商">
+              <el-text>{{ form.manufacturers }}</el-text>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-        <el-col :lg="24" :xs="24">
-          <el-form-item label="备注">
-            <el-text>{{form.remark}}</el-text>
-          </el-form-item>
-        </el-col>
-      </el-row>
-        <el-row  v-if="dialog.type === 1 && checkPerm('outsource:audit')" >
+          <el-col :lg="24" :xs="24">
+            <el-form-item label="备注">
+              <el-text>{{ form.remark }}</el-text>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="dialog.type === 1 && checkPerm('outsource:audit')">
           <el-col :lg="24" :xs="24">
             <el-form-item label="审核意见">
               <el-radio-group v-model="radio">
-                <el-radio :value=0>通 过</el-radio>
-                <el-radio :value=1>不通过</el-radio>
+                <el-radio :value="0">通 过</el-radio>
+                <el-radio :value="1">不通过</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row  v-if="form.state !== '0'" >
+        <el-row v-if="form.state !== '0'">
           <el-col :lg="8" :xs="24">
             <el-form-item label="审核人">
-              <el-text>{{form.auditUser}}</el-text>
+              <el-text>{{ form.auditUser }}</el-text>
             </el-form-item>
           </el-col>
           <el-col :lg="8" :xs="24">
             <el-form-item label="审核时间">
-              <el-text>{{form.auditTime}}</el-text>
+              <el-text>{{ form.auditTime }}</el-text>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
 
-      <div class="dialog-footer" align="center" v-if="dialog.type === 1 && checkPerm('outsource:audit')">
+      <div
+        class="dialog-footer"
+        align="center"
+        v-if="dialog.type === 1 && checkPerm('outsource:audit')"
+      >
         <el-button @click="dialog.visible = false">取 消</el-button>
         <el-button type="primary" @click="audit">审 核</el-button>
       </div>
@@ -178,7 +185,7 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { checkPerm } from "@/directive/permission";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import {queryOutSourceDetails,updateOutSourceApply} from "@/api/process";
+import { queryOutSourceDetails, updateOutSourceApply } from "@/api/process";
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
@@ -186,48 +193,49 @@ const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
-const radio = ref(0)
+const radio = ref(0);
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/process/outsource",
   });
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-const loading = ref(false)
+const loading = ref(false);
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const dialog = reactive({
   title: "委外详情",
   visible: false,
-  type: 0
+  type: 0,
 });
-const openDialog = (type,id) =>{
-  dialog.title = type === 0 ? '委外详情' : '委外审核' ;
-  queryOutSourceDetails(id).then((data)=>{
-    form.value = data.data
-    radio.value = 0
-    if(form.value){
-      if(form.value.state === '2'){
-        radio.value = 1
+const openDialog = (type, id) => {
+  dialog.title = type === 0 ? "委外详情" : "委外审核";
+  queryOutSourceDetails(id).then((data) => {
+    form.value = data.data;
+    radio.value = 0;
+    if (form.value) {
+      if (form.value.state === "2") {
+        radio.value = 1;
       }
     }
-    dialog.visible = true
-    dialog.type = type
-  })
-}
-const audit = () =>{
-  form.value.state = radio.value === 0 ? 1: 2;
-  updateOutSourceApply(form.value).then((data)=>{
-    if(data.code === '200'){
-      ElMessage.success("操作成功")
-      dialog.visible = false
-      dataList()
-    }else{
-      ElMessage.error(data.msg)
+    dialog.visible = true;
+    dialog.type = type;
+  });
+};
+const audit = () => {
+  form.value.state = radio.value === 0 ? 1 : 2;
+  updateOutSourceApply(form.value).then((data) => {
+    if (data.code === "200") {
+      ElMessage.success("操作成功");
+      dialog.visible = false;
+      dataList();
+    } else {
+      ElMessage.error(data.msg);
     }
-  })
-}
+  });
+};
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   addBtn: false,
@@ -292,9 +300,7 @@ option.value = Object.assign(option.value, {
       type: "select",
       search: true,
       width: 90,
-      dicUrl:
-          dictDataUtil.request_url +
-          dictDataUtil.TYPE_CODE.outsource_state,
+      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.outsource_state,
       props: {
         label: "dictLabel",
         value: "dictValue",

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

@@ -78,7 +78,7 @@
                 highlight-current-row
               >
                 <el-table-column
-                  label="流转卡号"
+                  label="WIN码"
                   align="left"
                   width="350"
                   prop="seqNo"

+ 25 - 16
src/views/quality/unqualified/columns.ts

@@ -1,52 +1,61 @@
 import { useDictionaryStore } from "../../../store/index";
 const { dicts } = useDictionaryStore();
 export const columns = [
-
   {
-    label: "流转卡号", prop: "seqNo", overHidden: true,search:true,
+    label: "WIN码",
+    prop: "seqNo",
+    overHidden: true,
+    search: true,
   },
   {
     label: "工单号",
     prop: "workOrderCode",
     overHidden: true,
-    width:120,
+    width: 120,
     search: true,
   },
   {
     label: "订单号",
     prop: "orderCode",
     overHidden: true,
-    width:120,
+    width: 120,
     search: true,
   },
   {
     label: "不合格数量",
     overHidden: true,
-    width:100,
+    width: 100,
     prop: "unqualifiedNum",
   },
 
   {
-    label: "审理单号", prop: "trackingNumber", overHidden: true,search:true
-
+    label: "审理单号",
+    prop: "trackingNumber",
+    overHidden: true,
+    search: true,
   },
   {
-    label: "产品编码", prop: "materialCode", overHidden: true,
-    width:120,
-
+    label: "产品编码",
+    prop: "materialCode",
+    overHidden: true,
+    width: 120,
   },
   {
-    label: "产品名称", prop: "materialName", overHidden: true,
-    width:100,
+    label: "产品名称",
+    prop: "materialName",
+    overHidden: true,
+    width: 100,
   },
   {
-    label: "故障描述", prop: "remark",
+    label: "故障描述",
+    prop: "remark",
     overHidden: true,
-    width:100,
+    width: 100,
   },
   {
-    label: "报故人", prop: "creator",
+    label: "报故人",
+    prop: "creator",
     overHidden: true,
-    width:100,
+    width: 100,
   },
 ];

+ 1 - 1
src/views/report/productionScheduling/line/index.vue

@@ -152,7 +152,7 @@ option.value = Object.assign(option.value, {
           dictValue: "1",
         },
         {
-          dictLabel: "流转卡号",
+          dictLabel: "WIN码",
           dictValue: "2",
         },
         {

+ 1 - 1
src/views/report/productionScheduling/order/index.vue

@@ -142,7 +142,7 @@ option.value = Object.assign(option.value, {
           dictValue: "1",
         },
         {
-          dictLabel: "流转卡号",
+          dictLabel: "WIN码",
           dictValue: "2",
         },
         {

+ 39 - 14
src/views/report/statistics/dailystorage/index.vue

@@ -1,21 +1,46 @@
 <template>
   <div class="mainContentBox">
-    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
-      v-model:page="data1.page" @row-save="createRow" @row-update="updateRow" @row-del="deleteRow"
-      @search-change="searchChange" @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
-      @selection-change="selectionChange" @cell-click="ckickCell">
+    <avue-crud
+      ref="crudRef1"
+      v-model:search="data1.search"
+      :data="data1.data"
+      :option="data1.option"
+      v-model:page="data1.page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
+      @cell-click="ckickCell"
+    >
       <template #header="{ size }">
         <div id="dailystoragecharts"></div>
       </template>
     </avue-crud>
-    <el-dialog v-model="editDialog.visible" :title="editDialog.title" width="1200px"
-      @close="editDialog.visible = false">
+    <el-dialog
+      v-model="editDialog.visible"
+      :title="editDialog.title"
+      width="1200px"
+      @close="editDialog.visible = false"
+    >
       <div class="mainContentBox">
-        <avue-crud ref="crudRef2" v-model:search="data2.search" :data="data2.data" :option="data2.option"
-          v-model:page="data2.page" @row-update="data2.Methords.updateRow" @row-del="data2.Methords.deleteRow"
-          @search-change="data2.Methords.dataList" @search-reset="data2.Methords.resetChange"
-          @size-change="data2.Methords.dataList" @current-change="data2.Methords.dataList"
-          @selection-change="data2.Methords.selectionChange" />
+        <avue-crud
+          ref="crudRef2"
+          v-model:search="data2.search"
+          :data="data2.data"
+          :option="data2.option"
+          v-model:page="data2.page"
+          @row-update="data2.Methords.updateRow"
+          @row-del="data2.Methords.deleteRow"
+          @search-change="data2.Methords.dataList"
+          @search-reset="data2.Methords.resetChange"
+          @size-change="data2.Methords.dataList"
+          @current-change="data2.Methords.dataList"
+          @selection-change="data2.Methords.selectionChange"
+        />
       </div>
     </el-dialog>
   </div>
@@ -212,11 +237,11 @@ data2.value.option = Object.assign(data2.value.option, {
   delBtn: false,
   column: [
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
       search: false,
-      width:150,
-      overHidden:true,
+      width: 150,
+      overHidden: true,
     },
     {
       label: "交付日期",

+ 1 - 1
src/views/report/statistics/outputstatistics/index.vue

@@ -177,7 +177,7 @@ data1.value.option = Object.assign(data1.value.option, {
       search: false,
     },
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
       search: false,
     },

+ 1 - 1
src/views/report/statistics/processanomaly/index.vue

@@ -286,7 +286,7 @@ data2.value.option = Object.assign(data2.value.option, {
       search: false,
     },
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
       search: false,
     },

+ 1 - 1
src/views/report/workhourinfo/sumhours/index.vue

@@ -237,7 +237,7 @@ data2.value.option = Object.assign(data2.value.option, {
     },
 
     {
-      label: "流转卡号",
+      label: "WIN码",
       prop: "seqNo",
       search: false,
     },

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

@@ -1,22 +1,22 @@
 <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="createRow"
-        @row-update="updateRow"
-        @row-del="deleteRow"
-        @search-change="searchChange"
-        @search-reset="resetChange"
-        @size-change="dataList"
-        @current-change="dataList"
-        :row-style="rowStyle"
-        :cell-style="cellStyle"
-        @selection-change="selectionChange"
+      ref="crudRef"
+      v-model:search="search"
+      v-model="form"
+      :data="data"
+      :option="option"
+      v-model:page="page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      :row-style="rowStyle"
+      :cell-style="cellStyle"
+      @selection-change="selectionChange"
     >
       <template #menu-left="{ size }">
         <el-button
@@ -30,12 +30,12 @@
       </template>
     </avue-crud>
     <el-dialog
-        v-model="dialog1.visible"
-        :title="dialog1.title"
-        width="950px"
-        @close="dialog1.visible = false"
+      v-model="dialog1.visible"
+      :title="dialog1.title"
+      width="950px"
+      @close="dialog1.visible = false"
     >
-      <choice-item-page @materialInfo="materialInfo"/>
+      <choice-item-page @material-info="materialInfo" />
     </el-dialog>
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
   </div>
@@ -58,7 +58,8 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/wms/stock",
   });
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
 
@@ -68,12 +69,12 @@ const dialog1 = reactive({
   visible: false,
 });
 const materialInfo = (value) => {
-  form.value.materialNo = value.materialCode
-  form.value.materialName = value.materialName
-  form.value.materialModel = value.spec
-  form.value.unit = value.unitDictValue
-  dialog1.visible = false
-}
+  form.value.materialNo = value.materialCode;
+  form.value.materialName = value.materialName;
+  form.value.materialModel = value.spec;
+  form.value.unit = value.unitDictValue;
+  dialog1.visible = false;
+};
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   delBtn: false,
@@ -133,8 +134,7 @@ option.value = Object.assign(option.value, {
       search: true,
       width: 90,
       overHidden: true,
-      dicUrl:
-          dictDataUtil.request_url +"stock_material_type",
+      dicUrl: dictDataUtil.request_url + "stock_material_type",
       props: {
         label: "dictLabel",
         value: "dictValue",
@@ -176,10 +176,10 @@ option.value = Object.assign(option.value, {
       width: 120,
       overHidden: true,
       prop: "batchCode",
-      search: true
+      search: true,
     },
     /*{
-      label: "流转卡号",
+      label: "WIN码",
       width: 130,
       overHidden: true,
       prop: "seqNo",
@@ -190,8 +190,8 @@ option.value = Object.assign(option.value, {
       width: 130,
       overHidden: true,
       click: ({ value, column }) => {
-        if(column.boxType){
-          dialog1.visible = true
+        if (column.boxType) {
+          dialog1.visible = true;
         }
       },
       /*rules: [
@@ -205,18 +205,18 @@ option.value = Object.assign(option.value, {
     {
       label: "数量",
       prop: "num",
-      type: 'number',
+      type: "number",
       min: 0,
       max: 99999,
       width: 150,
       overHidden: true,
-      formatter:(val,value,label)=>{
-        if(val.warningMsg){
-          return val.num+"("+val.warningMsg+")"
-        }else{
-          return val.num
+      formatter: (val, value, label) => {
+        if (val.warningMsg) {
+          return val.num + "(" + val.warningMsg + ")";
+        } else {
+          return val.num;
         }
-      }
+      },
     },
     {
       label: "单位",
@@ -224,31 +224,31 @@ option.value = Object.assign(option.value, {
     },
   ],
 });
-const rowStyle = ({row,column,rowIndex}) =>{
-  if(row.warningMsg){
+const rowStyle = ({ row, column, rowIndex }) => {
+  if (row.warningMsg) {
     return {
-      backgroundColor:'#f3d2d2',
-      color:'#6c6a6a'
-    }
+      backgroundColor: "#f3d2d2",
+      color: "#6c6a6a",
+    };
   }
-}
-const cellStyle = ({row,column,rowIndex,columnIndex})=>{
-  if(columnIndex === 10){
-    if(row.warningMsg){
+};
+const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
+  if (columnIndex === 10) {
+    if (row.warningMsg) {
       return {
-        color:'red',
-        fontWeight:'bold',
-        fontSize:'20'
-      }
-    }else{
+        color: "red",
+        fontWeight: "bold",
+        fontSize: "20",
+      };
+    } else {
       return {
-        color: '#60fc56',
-        fontWeight:'bold',
-        fontSize:'20'
-      }
+        color: "#60fc56",
+        fontWeight: "bold",
+        fontSize: "20",
+      };
     }
   }
-}
+};
 onMounted(() => {
   // console.log("crudRef", crudRef)
   dataList();