Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

package.json

@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@smallwei/avue": "^3.3.3",
+    "@smallwei/avue": "^3.5.2",
     "@types/smallwei__avue": "^3.0.5",
     "@vue-flow/background": "^1.3.0",
     "@vue-flow/core": "^1.37.1",

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

@@ -15,6 +15,7 @@
       @size-change="dataList"
       @current-change="dataList"
       @selection-change="selectionChange"
+      :before-open="beforeOpenDialog"
     >
       <template #menu-left="{ size }">
         <el-button
@@ -26,6 +27,27 @@
           >删除</el-button
         >
       </template>
+
+      <template #customFieldName-form="scope">
+        <el-select
+          v-model="customFieldNameValues"
+          multiple
+          filterable
+          allow-create
+          default-first-option
+          :reserve-keyword="false"
+          placeholder="请输入名称，按回车创建"
+          @change="customFieldChange"
+        >
+          <el-option
+            v-for="item in customFieldOptions"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+          />
+        </el-select>
+      </template>
+
       <template #menu-right="{}">
         <el-dropdown split-button
           >导入
@@ -113,6 +135,29 @@ const switchOp = [
     value: 1,
   },
 ];
+
+// 自定义工序项目字段名称相关方法
+const customFieldNameValues = ref([]);
+const customFieldOptions = [];
+const customFieldChange = (val) => {
+  let result = Array.from(val);
+  result = result.map((item) => {
+    return {
+      value: item,
+      isSelected: true,
+    };
+  });
+
+  form.value.customFieldName = JSON.stringify(result);
+};
+const beforeOpenDialog = (done, type, loading) => {
+  customFieldOptions.value = JSON.parse(form.value.customFieldName);
+  customFieldNameValues.value = customFieldOptions.value.map(
+    (item) => item.value
+  );
+  done();
+};
+
 option.value = Object.assign(option.value, {
   selection: true,
   labelWidth: 120,
@@ -289,6 +334,16 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
+      label: "方法",
+      prop: "method",
+      span: 12,
+    },
+    {
+      label: "试验规程编号",
+      prop: "testPlanCode",
+      span: 12,
+    },
+    {
       label: "是否可跳过",
       prop: "skipped",
       span: 8,
@@ -306,6 +361,14 @@ option.value = Object.assign(option.value, {
       value: 0,
     },
     {
+      label: "是否特殊工序",
+      prop: "isSpecial",
+      span: 8,
+      type: "switch",
+      dicData: switchOp,
+      value: 0,
+    },
+    {
       label: "是否禁用",
       prop: "enabled",
       hide: true,
@@ -394,6 +457,30 @@ option.value = Object.assign(option.value, {
         };
       },
     },
+    {
+      label: "是否自定义名称",
+      prop: "customEnable",
+      span: 8,
+      hide: true,
+      type: "switch",
+      dicData: switchOp,
+      value: 0,
+      //联动隐藏
+      control: (val, form) => {
+        return {
+          customFieldName: {
+            display: val == 1 ? true : false,
+          },
+        };
+      },
+    },
+    {
+      label: "自定义工序项目字段名称",
+      prop: "customFieldName",
+      hide: true,
+      span: 24,
+    },
+
     /*{
       label: "是否委外",
       prop: "outsourcing",

src/views/base/craftManagement/route/bindConfig.ts

@@ -179,6 +179,14 @@ export const formOption = {
       value: 0,
     },
     {
+      label: "是否特殊工序",
+      prop: "isSpecial",
+      span: 24,
+      type: "switch",
+      dicData: switchOp,
+      value: 0,
+    },
+    {
       label: "工艺条件",
       prop: "processAsk",
       span: 24,
@@ -189,6 +197,29 @@ export const formOption = {
       span: 24,
       type: "textarea",
     },
+    {
+      label: "是否自定义名称",
+      prop: "customEnable",
+      span: 8,
+      hide: true,
+      type: "switch",
+      dicData: switchOp,
+      value: 0,
+      //联动隐藏
+      control: (val, form) => {
+        return {
+          customFieldName: {
+            display: val == 1 ? true : false,
+          },
+        };
+      },
+    },
+    {
+      label: "自定义工序项目字段名称",
+      prop: "customFieldName",
+      hide: true,
+      span: 24,
+    },
     /*{
       label: "tbom文件",
       prop: "tbomUrl",

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

@@ -121,6 +121,22 @@
                     :show-tip="false"
                   />
                 </template>
+                <template #customFieldName>
+                  <el-select
+                    v-model="customFieldNameValues"
+                    multiple
+                    default-first-option
+                    :reserve-keyword="false"
+                    placeholder="请选择名称"
+                  >
+                    <el-option
+                      v-for="item in customFieldOptions"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </template>
               </avue-form>
               <div class="btns">
                 <el-tooltip
@@ -207,12 +223,25 @@ const edgeClick = (event) => {
     selectNode.value = null;
   }
 };
+
+// 自定义工序项目字段名称相关方法
+const customFieldNameValues = ref([]);
+const customFieldOptions = ref([]);
 const nodeClick = (event) => {
   if (usableStatus.value == false && !editStatus.value) return;
   if (!editStatus.value) {
     selectNode.value = event.node;
   } else {
     currentProcess.value = event.node;
+
+    // 设置自定义字段名称的选项内容等
+
+    customFieldOptions.value = JSON.parse(event.node.customFieldName);
+    customFieldNameValues.value = customFieldOptions.value
+      .filter((item) => {
+        return item.isSelected;
+      })
+      .map((item) => item.value);
   }
 };
 //当使用回退时清空选择的node
@@ -306,7 +335,21 @@ const deleteFlow = () => {
   selectLine.value = null;
   ElMessage.success("删除成功");
 };
+
 const saveInfo = async () => {
+  // 处理currentProcess的自定义对象名称字段，如果customFieldNameValues在customFieldOptions中存在，则设置isSelected为true，否则设置为false,最后转为json
+  const customFieldArr = [];
+  customFieldOptions.value.forEach((item) => {
+    let obj = {
+      value: item.value,
+      isSelected: customFieldNameValues.value.includes(item.value),
+    };
+    customFieldArr.push(obj);
+  });
+
+  console.log(customFieldArr);
+  currentProcess.value.customFieldName = JSON.stringify(customFieldArr);
+
   flowData.value.nodes.forEach((item, index) => {
     if (item.id == currentProcess.value.id) {
       flowData.value.nodes[index] = currentProcess.value;

src/views/plan/finishProduct/components/detail-stock.vue

@@ -1,5 +1,4 @@
 <template>
-
   <div class="mainContentBox">
     <avue-crud
       ref="crudRef"
@@ -15,117 +14,109 @@
       @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: "管号",
+      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>

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

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

src/views/plan/order/index.vue

@@ -319,7 +319,9 @@ const permission = reactive({
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 option.value = {
   border: true,
-  searchIndex: 3,
+  index: true, //是否显示第几项
+  indexLabel: "序号",
+  indexWidth: "55px",
   searchIcon: true,
   editBtn: false,
   delBtn: false,

src/views/plan/schedule/index.vue

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

src/views/plan/track/index.vue

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

src/views/plan/workOrder/components/work-order-page.vue

@@ -7,12 +7,19 @@
       :data="data"
       :option="option"
       v-model:page="page"
-      @row-click="rowClick"
+      @row-click="clickItem"
       @search-change="searchChange"
       @search-reset="resetChange"
       @size-change="dataList"
       @current-change="dataList"
-    />
+      @selection-change="selectionChange"
+    >
+      <template #footer>
+        <div v-if="multipleKey" style="width:60px;height:35px;float:right;margin-top: 15px;">
+          <el-button type="primary" @click="onSelected"> 确定 </el-button>
+        </div>
+      </template>
+    </avue-crud>
   </div>
 </template>
 <script setup>
@@ -26,10 +33,25 @@ const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
+const props = defineProps({
+  queryType: {
+    type: String,
+    default: () => {
+      return "0";
+    },
+  },
+  multipleKey:{
+    type: String,
+    default: ()=>{
+      return null;
+    }
+  }
+});
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/plan/workOrder",
+    multipleSelectKey: props.multipleKey,
   });
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
   Methords; //增删改查
@@ -41,18 +63,22 @@ const emit = defineEmits(["orderInfo"]);
 const rowClick = (row) => {
   emit("orderInfo", row);
 };
-const props = defineProps({
-  queryType: {
-    type: String,
-    default: () => {
-      return "0";
-    },
-  },
-});
+const multipleKeyVal = ref(null)
+
+const onSelected = () => {
+  emit("orderInfo", toDeleteIds.value);
+};
+const clickItem = (row)=>{
+  if(!props.multipleKey){
+    rowClick(row)
+  }
+}
+
+
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   delBtn: false,
-  selection: false,
+  selection: props.multipleKey ? true : false,
   search: false,
   editBtn: false,
   addBtn: false,
@@ -227,6 +253,7 @@ option.value = Object.assign(option.value, {
 });
 
 onMounted(() => {
+  multipleKeyVal.value = props.multipleKey
   search.value.queryType = String(props.queryType);
   dataList();
 });

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

@@ -287,7 +287,7 @@ const uploadFinished = () => {
 };
 const importExcelData = () => {
   if (uploadRef.value) {
-    uploadRef.value.show("/api/v1/plan/seq/import", "流转号导入", {
+    uploadRef.value.show("/api/v1/plan/seq/import", "管号导入", {
       workOrderCode: search.value.workOrderCode,
     });
   }

src/views/plan/workOrder/index.vue

@@ -294,7 +294,7 @@
       width="950px"
       @close="dialog7.visible = false"
     >
-      <work-order-page queryType="2" @order-info="workOrderInfoClick" />
+      <work-order-page queryType="2" @order-info="workOrderInfoClick" multipleKey="workOrderCode"/>
     </el-dialog>
   </div>
 </template>
@@ -528,7 +528,9 @@ const handleSubmit = () => {
   });
 };
 const workOrderInfoClick = (value) => {
-  form.value.frontWorkOrderCode = value.workOrderCode;
+  if(value){
+    form.value.frontWorkOrderCode = value.join(',');
+  }
   dialog7.visible = false;
 };
 const orderInfo = (value) => {
@@ -797,6 +799,7 @@ option.value = Object.assign(option.value, {
       prop: "frontWorkOrderCode",
       width: "100",
       display: false,
+      overHidden: true,
       rules: [
         {
           required: true,

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="管号">{{
               productReviewInfo.seqNo
             }}</el-descriptions-item>
             <el-descriptions-item label="物料编号">{{
@@ -252,7 +252,7 @@ const chooseTagType = (row, type) => {
   let daynamicType = "";
   if (type == "text") {
     daynamicType =
-      row === "order" ? "订单" : row === "workOrder" ? "工单" : "流转卡号";
+      row === "order" ? "订单" : row === "workOrder" ? "工单" : "管号";
   } else {
     daynamicType =
       row === "order" ? "success" : row === "workOrder" ? "warning" : "primary";
@@ -358,7 +358,7 @@ option.value = Object.assign(option.value, {
       hide: true,
     },
     {
-      label: "流转卡号",
+      label: "管号",
       prop: "seqNo",
       search: true,
       searchLabelWidth: "100",

src/views/quality/faultHandle/index.vue

@@ -257,7 +257,7 @@ option.value = Object.assign(option.value, {
     },
 
     {
-      label: "流转卡号",
+      label: "管号",
       prop: "seqNo",
       overHidden: true,
       search: true,

src/views/quality/feedback/components/process.vue

@@ -18,7 +18,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="流转卡号：">
+          <el-form-item label="管号：">
             <span class="text">{{ formData.seqs }}</span>
           </el-form-item>
         </el-col>

src/views/quality/feedback/components/show.vue

@@ -44,7 +44,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td class="titlesmall">流转卡号</td>
+                    <td class="titlesmall">管号</td>
                     <td colspan="5">
                       {{ tableData.code ? tableData.code : "/" }}
                     </td>

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="管号"
+                  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",

src/views/quality/reject/components/process.vue

@@ -18,7 +18,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="流转卡号：">
+          <el-form-item label="管号：">
             <span class="text">{{ formData.seqs }}</span>
           </el-form-item>
         </el-col>

src/views/quality/reject/components/show.vue

@@ -44,7 +44,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td class="titlesmall">流转卡号</td>
+                    <td class="titlesmall">管号</td>
                     <td colspan="5">
                       {{ tableData.code ? tableData.code : "/" }}
                     </td>

src/views/quality/tdm/index.vue

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

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: "管号",
+    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,
   },
 ];

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: "管号",
       prop: "seqNo",
       search: false,
-      width:150,
-      overHidden:true,
+      width: 150,
+      overHidden: true,
     },
     {
       label: "交付日期",

src/views/report/statistics/outputstatistics/index.vue

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

src/views/report/statistics/processanomaly/index.vue

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

src/views/report/workhourinfo/sumhours/index.vue

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