Merge branch 'master' into 测试

src/views/group/order/management/detail.vue

@@ -381,30 +381,24 @@ const formData = reactive({
 });
 const formConfig = computed(() => {
   return [
-    formData.data.source !== 2
-      ? {
-          type: "title",
-          title: "类型",
-          label: "",
-        }
-      : {},
-    formData.data.source !== 2
-      ? {
-          type: "slot",
-          prop: "type",
-          slotName: "type",
-          label: "订单类型",
-        }
-      : {},
-    formData.data.source !== 2
-      ? {
-          type: "slot",
-          prop: "departmentId",
-          slotName: "departmentId",
-          label: "事业部",
-          itemWidth: 25,
-        }
-      : {},
+    {
+      type: "title",
+      title: "类型",
+      label: "",
+    },
+    {
+      type: "slot",
+      prop: "type",
+      slotName: "type",
+      label: "订单类型",
+    },
+    {
+      type: "slot",
+      prop: "departmentId",
+      slotName: "departmentId",
+      label: "事业部",
+      itemWidth: 25,
+    },
     {
       type: "title",
       title: "产品",

src/views/production/warehouse/outbound/index.vue

@@ -11,10 +11,10 @@
             :searchConfig="searchConfig"
             highlight-current-row
             :action-list="[
-              {
-                text: '出库登记',
-                action: () => clickModal(),
-              },
+              // {
+              //   text: '出库登记',
+              //   action: () => clickModal(),
+              // },
             ]"
             @get-list="getList"
             @clickReset="clickReset">
@@ -34,10 +34,10 @@
             :searchConfig="searchConfigTwo"
             highlight-current-row
             :action-list="[
-              {
-                text: '出库登记',
-                action: () => clickModal(),
-              },
+              // {
+              //   text: '出库登记',
+              //   action: () => clickModal(),
+              // },
             ]"
             @get-list="getListTwo"
             @clickReset="clickResetTwo">

src/views/production/warehouse/putInStorage/add.vue

@@ -33,7 +33,7 @@
                 </el-form-item>
                 <el-form-item label="入库类型" prop="detailType" style="width: 100%; margin-bottom: 18px">
                   <el-select v-model="formData.data.detailType" placeholder="请选择入库类型" clearable style="width: 100%">
-                    <el-option v-for="item in useUserStore().allDict['put_stock_type']" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+                    <el-option v-for="item in getType()" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
                   </el-select>
                 </el-form-item>
                 <el-form-item label="申请人" prop="applicant" style="width: 100%; margin-bottom: 18px">
@@ -277,6 +277,13 @@ const clickCancel = () => {
     path: "/production/warehouse/warehouse-putInStorage",
   });
 };
+const getType = () => {
+  let list = [];
+  if (proxy.useUserStore().allDict["put_stock_type"] && proxy.useUserStore().allDict["put_stock_type"].length > 0) {
+    list = proxy.useUserStore().allDict["put_stock_type"].filter((item) => item.dictKey == "1");
+  }
+  return list;
+};
 </script>
 
 <style lang="scss" scoped>

src/views/subsidiary/order/management/add.vue

@@ -445,32 +445,24 @@ const formData = reactive({
 });
 const formConfig = computed(() => {
   return [
-    formData.data.source !== 2
-      ? {
-          type: "title",
-          title: "类型",
-          label: "",
-        }
-      : {},
-
-    formData.data.source !== 2
-      ? {
-          type: "slot",
-          prop: "type",
-          slotName: "type",
-          label: "订单类型",
-        }
-      : {},
-
-    formData.data.source !== 2
-      ? {
-          type: "slot",
-          prop: "departmentId",
-          slotName: "departmentId",
-          label: "事业部",
-          itemWidth: 25,
-        }
-      : {},
+    {
+      type: "title",
+      title: "类型",
+      label: "",
+    },
+    {
+      type: "slot",
+      prop: "type",
+      slotName: "type",
+      label: "订单类型",
+    },
+    {
+      type: "slot",
+      prop: "departmentId",
+      slotName: "departmentId",
+      label: "事业部",
+      itemWidth: 25,
+    },
     {
       type: "title",
       title: "产品",

src/views/subsidiary/order/management/design.vue

@@ -355,32 +355,25 @@ const formData = reactive({
 });
 const formConfig = computed(() => {
   return [
-    formData.data.source !== 2
-      ? {
-          type: "title",
-          title: "类型",
-          label: "",
-        }
-      : {},
-
-    formData.data.source !== 2
-      ? {
-          type: "slot",
-          prop: "type",
-          slotName: "type",
-          label: "订单类型",
-        }
-      : {},
-
-    formData.data.source !== 2
-      ? {
-          type: "slot",
-          prop: "departmentId",
-          slotName: "departmentId",
-          label: "事业部",
-          itemWidth: 25,
-        }
-      : {},
+    {
+      type: "title",
+      title: "类型",
+      label: "",
+    },
+    {
+      type: "slot",
+      prop: "type",
+      slotName: "type",
+      label: "订单类型",
+    },
+    {
+      type: "slot",
+      prop: "departmentId",
+      slotName: "departmentId",
+      label: "事业部",
+      itemWidth: 25,
+      disabled: true,
+    },
     {
       type: "title",
       title: "产品",