订单流转卡好上传

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

@@ -102,6 +102,12 @@ option.value = Object.assign(option.value, {
       prop: "materialModel",
     },
     {
+      label: "产品版本",
+      width: 130,
+      overHidden: true,
+      prop: "materialVersion",
+    },
+    {
       label: "订单状态",
       prop: "orderState",
       display: false,

src/views/plan/order/index.vue

@@ -270,6 +270,19 @@ option.value = {
       prop: "materialModel",
     },
     {
+      label: "产品版本",
+      width: 120,
+      overHidden: true,
+      prop: "materialVersion",
+      rules: [
+        {
+          required: true,
+          message: "产品版本不能为空",
+          trigger: "trigger",
+        },
+      ],
+    },
+    {
       label: "订单状态",
       prop: "orderState",
       display: false,

src/views/plan/workOrder/components/choice-route-page.vue

@@ -32,6 +32,12 @@ const props = defineProps({
     default: () => {
       return '';
     }
+  },
+  materialVersion: {
+    type: String,
+    default: () => {
+      return '';
+    }
   }
 })
 watch(
@@ -42,6 +48,14 @@ watch(
     dataList();
   }
 );
+watch(
+    () => props.materialVersion,
+    () => {
+      search.value.processRouteVersion = props.materialVersion
+      search.value.enabled = "0"
+      dataList();
+    }
+);
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -113,10 +127,12 @@ option.value = Object.assign(option.value, {
       overHidden: true,
       minWidth: 200,
     },
-    // 在产品那边绑定了工艺路线才是已绑定
     {
       label: "路线状态",
-      prop: "used",
+      prop: "usable",
+      addDisplay: false,
+      editDisplay: false,
+      slot: true,
       width: 100,
       type: "radio",
       dicData: [
@@ -150,21 +166,15 @@ option.value = Object.assign(option.value, {
     {
       label: "版本",
       prop: "processRouteVersion",
-      addDisplay: false,
-      editDisplay: false,
     },
     {
       label: "创建人",
-      prop: "createBy",
-      addDisplay: false,
-      editDisplay: false,
+      prop: "creator",
       overHidden: true,
     },
     {
       label: "创建时间",
-      prop: "createWhen",
-      addDisplay: false,
-      editDisplay: false,
+      prop: "created",
       width: 150,
       overHidden: true,
     },
@@ -172,6 +182,7 @@ option.value = Object.assign(option.value, {
 });
 
 onMounted(() => {
+  search.value.processRouteVersion = props.materialVersion
   search.value.prodtCode = props.materialCode
   search.value.enabled = "0"
   dataList();

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

@@ -90,6 +90,12 @@ option.value = Object.assign(option.value, {
       overHidden: true,
     },
     {
+      label: "配套编码",
+      prop: "supportingCode",
+      search: true,
+      overHidden: true,
+    },
+    {
       label: "铭牌号",
       prop: "nameplateNo",
       search: true,

src/views/plan/workOrder/index.vue

@@ -90,7 +90,7 @@
         width="80%"
         @close="dialog1.visible = false"
     >
-      <choice-route-page :material-code="form.materialCode" @routeInfo="routeInfo"/>
+      <choice-route-page :material-version="materialVersion" :material-code="form.materialCode" @routeInfo="routeInfo"/>
     </el-dialog>
 
     <el-dialog
@@ -293,6 +293,7 @@ const handleSubmit =()=>{
     }
   });
 }
+const materialVersion = ref(null)
 const orderInfo = (value) => {
   form.value.orderCode = value.orderCode
   form.value.orderName = value.orderName
@@ -300,6 +301,7 @@ const orderInfo = (value) => {
   form.value.materialName = value.materialName
   form.value.materialModel = value.materialModel
   form.value.priority = value.priority
+  materialVersion.value = value.materialVersion
   dialog.visible = false
 }
 const lineInfo = (value) => {

src/views/system/dict/components/dict-item.vue

@@ -116,6 +116,8 @@ function openDialog(form?: any) {
     dialog.title = "新增字典";
     dataFormRef.value.label = "";
     dataFormRef.value = "";
+    formData.dictLabel = "";
+    formData.dictValue = ""
   }
 }