Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/plan/order/components/returnPre.vue

@@ -10,7 +10,7 @@
   >
     <el-collapse accordion>
       <el-collapse-item
-        v-for="item in tableData"
+        v-for="item in filteredData"
         :title="item.docNo"
         :key="item"
       >
@@ -50,6 +50,15 @@ const getList = async () => {
   const { data } = await getReturnList(props.orderCode);
   tableData.value = data;
 };
+// 过滤
+const filteredData = computed(() => {
+    return tableData.value
+        .map(item => ({
+            ...item,
+            lineList: item.lineList.filter(line => line.moDocNo === props.orderCode)
+        }))
+});
+
 watch(
   () => props.modelValue,
   (newValue) => {

src/views/plan/order/index.vue

@@ -392,7 +392,7 @@ option.value = {
       type: "select", //类型为下拉选择框
       width: 100,
       overHidden: true,
-      editDisabled: true,
+      editDisabled: false,
       dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.plan_order_type,
       props: {
         label: "dictLabel",
@@ -636,25 +636,25 @@ option.value = {
       ],
       value: 0,
     },
-    {
-      label: "生产类型",
-      prop: "produceType",
-      width: 100,
-      overHidden: true,
-      type: "select", //类型为下拉选择框
-      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.produce_type,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
-      },
-      rules: [
-        {
-          required: true,
-          message: "请选择生产类型",
-          trigger: "trigger",
-        },
-      ],
-    },
+    // {
+    //   label: "生产类型",
+    //   prop: "produceType",
+    //   width: 100,
+    //   overHidden: true,
+    //   type: "select", //类型为下拉选择框
+    //   dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.produce_type,
+    //   props: {
+    //     label: "dictLabel",
+    //     value: "dictValue",
+    //   },
+    //   rules: [
+    //     {
+    //       required: true,
+    //       message: "请选择生产类型",
+    //       trigger: "trigger",
+    //     },
+    //   ],
+    // },
     {
       label: "备注",
       prop: "remark",