更改工艺版本

src/views/plan/order/index.vue

@@ -270,28 +270,6 @@ option.value = {
       prop: "materialModel",
     },
     {
-      label: "产品版本",
-      width: 120,
-      overHidden: true,
-      prop: "materialVersion",
-      rules: [
-        {
-          required: true,
-          message: "请输入小数点后只能有一位的数值",
-          trigger: "blur",
-          validator: (rule, value, callback) => {
-            if (!value) {
-              callback(new Error("输入不能为空"));
-            } else if (!/^\d+(\.\d{1})?$/.test(value)) {
-              callback(new Error("请输入小数点后只有一位的数值"));
-            } else {
-              callback();
-            }
-          }
-        }
-      ]
-    },
-    {
       label: "订单状态",
       prop: "orderState",
       display: false,

src/views/plan/prepare/index.vue

@@ -32,7 +32,8 @@
             </el-progress>
           </div>
         </div>
-        <el-tag v-if="row.workOrderCode === '-'" type="primary">库存数量:{{ row.stockNum }}</el-tag>
+        <el-tag v-if="row.workOrderCode === '-' && row.stockNum > 0" type="primary">库存数量:{{ row.stockNum }}</el-tag>
+        <el-tag v-if="row.workOrderCode === '-' && row.stockNum === '0'" type="danger">库存数量:{{ row.stockNum }}</el-tag>
       </template>
       <template #menu="{size,row,index}">
 <!--        <el-button
@@ -273,7 +274,7 @@ option.value = Object.assign(option.value, {
       prop: "orderName",
       search: true,
       disabled: true,
-      width: 150,
+      width: 140,
       overHidden: true,
       rules: [
         {
@@ -301,7 +302,7 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "工艺BOM",
-      width: 115,
+      width: 90,
       overHidden: true,
       prop: "bom",
       viewDisplay: false,
@@ -317,7 +318,7 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "工艺路线",
-      width: 115,
+      width: 160,
       overHidden: true,
       viewDisplay: false,
       addDisplay: false,
@@ -331,94 +332,12 @@ option.value = Object.assign(option.value, {
         return '<b class="el-tag el-tag--danger el-tag--light">-</b>';
       },
     },
-    /*{
-      label: "设计文件",
-      prop: "dataFile",
-      width: 115,
-      overHidden: true,
-      viewDisplay: false,
-      addDisplay: false,
-      editDisplay: false,
-      html: true,
-      formatter: (val) => {
-        if (val.dataFile === '1') {
-          return '<b class="el-tag el-tag--success el-tag--light">已齐套</b>';
-        }
-        return '<b class="el-tag el-tag--danger el-tag--light">未齐套</b>';
-      },
-    },*/
-   /* {
-      label: "工艺文件",
-      width: 115,
-      overHidden: true,
-      prop: "craftFiles",
-      type: 'checkbox',
-      span: 12,
-      hide: true,
-      dicData: [{label: '已齐套', value: '1'}],
-    },
-    {
-      label: "工艺BOM",
-      width: 150,
-      span: 12,
-      type: "checkbox",
-      overHidden: true,
-      prop: "boms",
-      hide: true,
-      dicData: [ { label: "已齐套", value: "1", }, ],
-    },
-    {
-      label: "工艺路线",
-      width: 150,
-      span: 12,
-      type: "checkbox",
-      overHidden: true,
-      hide: true,
-      prop: "routeIds",
-      dicData: [ { label: "已齐套", value: "1", }, ],
-    },*/
-   /* {
-      label: "设计文件",
-      prop: "dataFiles",
-      width: 150,
-      overHidden: true,
-      type: 'checkbox',
-      span: 12,
-      multiple: true,
-      hide: true,
-      dicData: [ { label: "已齐套", value: "1", }, ],
-    },*/
-    {
-      label: "设备状况",
-      prop: "deviceState",
-      width: 150,
-      hide: true,
-      addDisplay: false,
-      overHidden: true,
-      viewDisplay: false,
-      editDisplay: false,
-      span: 24,
-      dicData: [ { label: "已齐套", value: "1", },{ label: "未齐套", value: "0", }, ],
-    },
-    {
-      label: "物料状态",
-      prop: 'materialState',
-      width: 130,
-      hide: true,
-      editDisplay: false,
-      addDisplay: false,
-      viewDisplay: false,
-      overHidden: true,
-      span: 24,
-      dicData: [ { label: "已齐套", value: "1", },{ label: "未齐套", value: "0", },  ],
-    },
     {
       label: "设备状况",
       prop: "deviceStr",
       disabled: true,
       width: 200,
       overHidden: true,
-      span: 24,
       html: true,
       formatter: (val) => {
         if (val.deviceState === '1') {

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

@@ -49,7 +49,7 @@ const props = defineProps({
 watch(
   () => props.materialCode,
   () => {
-    search.value.materialCode = props.materialCode
+    search.value.prodtCode = props.materialCode
     dataList();
   }
 );
@@ -60,13 +60,6 @@ watch(
       dataList();
     }
 );
-watch(
-    () => props.materialVersion,
-    () => {
-      search.value.processRouteVersion = props.materialVersion
-      dataList();
-    }
-);
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -193,7 +186,6 @@ option.value = Object.assign(option.value, {
 });
 
 onMounted(() => {
-  search.value.processRouteVersion = props.materialVersion
   search.value.prodtCode = props.materialCode
   search.value.processRouteType =  props.processRouteType
   search.value.enabled = "0"

src/views/plan/workOrder/index.vue

@@ -102,7 +102,7 @@
         width="80%"
         @close="dialog1.visible = false"
     >
-      <choice-route-page :material-version="materialVersion" :processRouteType="processRouteType" :material-code="form.materialCode" @routeInfo="routeInfo"/>
+      <choice-route-page :processRouteType="processRouteType" :material-code="form.materialCode" @routeInfo="routeInfo"/>
     </el-dialog>
 
     <el-dialog
@@ -315,7 +315,7 @@ const handleSubmit =()=>{
     }
   });
 }
-const materialVersion = ref(null)
+
 const orderInfo = (value) => {
   form.value.orderCode = value.orderCode
   form.value.orderName = value.orderName
@@ -324,7 +324,15 @@ const orderInfo = (value) => {
   form.value.materialModel = value.materialModel
   form.value.priority = value.priority
   form.value.orderType = value.orderType
-  materialVersion.value = value.materialVersion
+  form.value.processRouteId = ''
+  form.value.processRouteCode = ''
+  form.value.processRouteName = ''
+  form.value.processRouteVersion = ''
+  form.value.productLineId = ''
+  form.value.productLineName = ''
+  form.value.workshopName = ''
+  form.value.workshopCode = ''
+  form.value.workshopName = ''
   dialog.visible = false
 }
 const lineInfo = (value) => {
@@ -342,6 +350,7 @@ const routeInfo = (value) => {
   form.value.processRouteId = value.id
   form.value.processRouteCode = value.processRouteCode
   form.value.processRouteName = value.processRouteName
+  form.value.processRouteVersion = value.processRouteVersion
   dialog1.visible = false
 }
 // 传入一个url，后面不带/
@@ -487,6 +496,17 @@ option.value = Object.assign(option.value, {
       },
     },
     {
+    label: "工艺版本",
+    width: 100,
+    overHidden: true,
+    prop: "processRouteVersion",
+    display: false,
+      html: true,
+      formatter: (val) => {
+        return '<b class="el-tag el-tag--success el-tag--light">'+val.processRouteVersion+'</b>';
+      },
+  },
+    {
       label: "生产车间",
       prop: "workshopName",
       width: 120,