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

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

@@ -19,20 +19,26 @@
 import {defineProps, ref} from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { useCommonStoreHook } from "@/store";
-import dictDataUtil from "@/common/configs/dictDataUtil";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
 const props = defineProps({
-  workOrderId: {
+  workOrderCode: {
     type: String,
     default: () => {
       return 0;
     }
   }
 })
+watch(
+    () => props.workOrderCode,
+    () => {
+      search.value.workOrderCode = props.workOrderCode
+      dataList();
+    }
+);
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -76,7 +82,7 @@ option.value = Object.assign(option.value, {
 });
 
 onMounted(() => {
-  search.value.workOrderId = props.workOrderId
+  search.value.workOrderCode = props.workOrderCode
   dataList();
 });
 </script>

src/views/plan/workOrder/index.vue

@@ -64,7 +64,7 @@
             icon="el-icon-setting"
             text
             v-if="row.workOrderState !== '0' && row.workOrderState !== '1'"
-            @click="dialog4.visible = true"
+            @click="showSeqPage(row.workOrderCode)"
             type="primary"
             :size="size">流水</el-button>
       </template>
@@ -111,7 +111,7 @@
         width="950px"
         @close="dialog4.visible = false"
     >
-      <work-order-seq :workOrderId="form.id"/>
+      <work-order-seq :workOrderCode="form.workOrderCode"/>
     </el-dialog>
 
     <el-dialog
@@ -209,6 +209,10 @@ const aps =(id)=>{
   formData.workOrderIds = [id]
   dialog5.visible = true
 }
+const showSeqPage =(workOrderCode)=>{
+  form.value.workOrderCode = workOrderCode
+  dialog4.visible = true
+}
 const distribute = (id)=>{
   ElMessageBox.confirm("当前操作不可逆,确定下发工单吗?")
       .then(() => {
@@ -304,12 +308,14 @@ option.value = Object.assign(option.value, {
       search: true,
       display: false,
       width: 125,
+      overHidden: true,
     },
     {
       label: "订单编号",
       prop: "orderCode",
       search: true,
       width: 125,
+      overHidden: true,
       rules: [
         {
           required: true,
@@ -328,25 +334,28 @@ option.value = Object.assign(option.value, {
       prop: "orderName",
       search: true,
       disabled: true,
-      width: 120,
+      width: 125,
+      overHidden: true,
     },
     {
       label: "产品编号",
-      width: 120,
+      width: 125,
+      overHidden: true,
       search: true,
       disabled: true,
       prop: "materialCode",
     },
     {
       label: "产品名称",
-      width: 120,
+      width: 125,
+      overHidden: true,
       search: true,
       disabled: true,
       prop: "materialName",
     },
     {
       label: "产品规格",
-      width: 120,
+      width: 125,
       search: true,
       overHidden: true,
       disabled: true,
@@ -381,7 +390,7 @@ option.value = Object.assign(option.value, {
     {
       label: "工艺路线",
       prop: "processRouteName",
-      width: 120,
+      width: 125,
       overHidden: true,
       rules: [
         {