66

src/api/materialPlan/index.js

@@ -80,8 +80,17 @@ export async function getMaterialList(data) {
 
 
 // 批量根据生产计划计算bom列表信息
-export async function listBomBySalesOrderIds(data) {
-  const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderIds`,data);
+// export async function listBomBySalesOrderIds(data) {
+//   const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderIds`,data);
+//   if (res.data.code == 0) {
+//     return res.data.data;
+//   }
+//   return Promise.reject(new Error(res.data.message));
+// }
+
+
+export async function listBomBySalesOrderIdsOverride(data) {
+  const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderIdsOverride`,data);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -89,6 +98,7 @@ export async function listBomBySalesOrderIds(data) {
 }
 
 
+
 // 根据销售订单计算bom列表信息
 export async function listBomBySalesOrderId(data) {
   const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderId`,data);

src/components/CreatePlan/ProductionVersion.vue

@@ -1,9 +1,10 @@
 <template>
   <ele-modal
     :visible.sync="visible"
-    title="选择工艺路线s"
+    title="选择工艺路线"
     width="75vw"
     append-to-body
+    :maxable="true"
   >
     <el-table
       :data="tableData"

src/components/CreatePlan/equipment-dailog.vue

@@ -4,6 +4,7 @@
     title="添加工单-选择设备"
     width="65vw"
     append-to-body
+    :maxable="true"
   >
     <div class="search-box">
       设备名称

src/components/select/SelectUser/index.vue

@@ -10,6 +10,7 @@
     title="选择用户"
     :append-to-body="appendToBody"
     @update:visible="updateVisible"
+    :maxable="true"
   >
     <div class="el-dialog-body-custom-height">
       <el-row :gutter="5">

src/components/select/organization/components/org-edit.vue

@@ -7,6 +7,7 @@
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改机构' : '添加机构'"
     @update:visible="updateVisible"
+    :maxable="true"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="82px">
       <el-row :gutter="15">

src/components/select/organization/components/org-user-edit.vue

@@ -7,6 +7,7 @@
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改用户' : '添加用户'"
     @update:visible="updateVisible"
+    :maxable="true"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="82px">
       <el-row :gutter="15">

src/layout/components/password-modal.vue

@@ -8,6 +8,7 @@
     :close-on-click-modal="true"
     @update:visible="updateVisible"
     @closed="onClose"
+    :maxable="true"
   >
     <el-form
       ref="form"

src/views/materialPlan copy/components/ProductionVersion.vue

@@ -4,6 +4,7 @@
     title="选择生产版本"
     width="75vw"
     append-to-body
+    :maxable="true"
   >
     <ele-pro-table
       ref="table"

src/views/materialPlan copy/components/plan-edit-dialog.vue

@@ -6,6 +6,7 @@
     custom-class="ele-dialog-form"
     :close-on-click-modal="true"
     :close-on-press-escape="false"
+    :maxable="true"
   >
     <el-form
       :model="formData"

src/views/materialPlan/components/plan-edit-dialog.vue

@@ -7,6 +7,7 @@
     :close-on-click-modal="true"
     :close-on-press-escape="false"
     width="80%"
+    :maxable="true"
   >
     <el-form
       :model="formData"
@@ -65,9 +66,6 @@
           >
             添加销售订单
           </el-button>
-
-  
-
         </template>
 
         <template v-slot:code="{ row }">
@@ -274,7 +272,7 @@
   import saleOrderPop from './saleOrderPop.vue';
   import ProductModal from './ProductModal.vue';
   import {
-    listBomBySalesOrderIds,
+    listBomBySalesOrderIdsOverride,
     listBomBySalesOrderId,
     save,
     getById
@@ -514,7 +512,7 @@
         ],
         rules: {
           demandType: [
-          {
+            {
               required: true,
               message: '请选择需求类型',
               trigger: ['blur', 'change']
@@ -538,13 +536,14 @@
         demandTypeList: []
       };
     },
+    created() {
+
+    },
 
     methods: {
       async open(type, row) {
         this.type = type;
-
         this.typeList();
-
         this.visible = true;
 
         if (row) {
@@ -558,13 +557,16 @@
 
       typeList() {
         this.requestDict('需求类型').then((res) => {
-          let _res = res || [];
-       
-          this.demandTypeList = _res.filter(
-            (f) => f.dictCode == 1 || f.dictCode == 6 || f.dictCode == 7
-          );
-
+          console.log(res, 999);
+          this.demandTypeList = [];
+          res.forEach((f) => {
+            console.log(f.dictCode);
+            if (f.dictCode == 1 || f.dictCode == 6 || f.dictCode == 7) {
+              this.demandTypeList.push(f);
+            }
+          });
 
+          this.$forceUpdate();
         });
       },
 
@@ -654,7 +656,7 @@
         });
 
         if (salesOrderIds.length > 0) {
-          listBomBySalesOrderIds({ salesOrderIds: salesOrderIds }).then(
+          listBomBySalesOrderIdsOverride({ salesOrderIds: salesOrderIds }).then(
             (res) => {
               res.forEach((m) => {
                 if (m.materialList.length > 0) {

src/views/materialPlan/components/produce-edit-dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <ele-modal :visible.sync="visible" :closed="cancel" :title="`${type == 'add' ? '创建' : '编辑'}生产配料计划`"
-    custom-class="ele-dialog-form" :close-on-click-modal="true" :close-on-press-escape="false" width="80%">
+    custom-class="ele-dialog-form" :close-on-click-modal="true" :close-on-press-escape="false" width="80%" :maxable="true">
     <el-form :model="formData" ref="formRef" label-width="120px" class="ele-body" :rules="rules">
       <el-row :gutter="32">
         <el-col :span="12">

src/views/materialPlan/components/producePlan.vue

@@ -7,6 +7,7 @@
       :close-on-click-modal="true"
       :close-on-press-escape="false"
       width="80%"
+      :maxable="true"
     >
       <el-form
         :model="formData"
@@ -558,14 +559,16 @@
   
         typeList() {
           this.requestDict('需求类型').then((res) => {
-            let _res = res || [];
-         
-            this.demandTypeList = _res.filter(
-              (f) => f.dictCode == 1 || f.dictCode == 6
-            );
-  
-  
+          this.demandTypeList = [];
+          res.forEach((f) => {
+            console.log(f.dictCode);
+            if (f.dictCode == 1 || f.dictCode == 6 || f.dictCode == 7) {
+              this.demandTypeList.push(f);
+            }
           });
+
+          this.$forceUpdate();
+        });
         },
   
         getDetail(id) {

src/views/outsourcePlan/components/outsourceAddOrEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <ele-modal :visible.sync="visible" :before-close="cancel" :title="`${ addOrEditFlag ? '创建' : '编辑'}委外计划`"
-             custom-class="ele-dialog-form" :close-on-click-modal="true" :close-on-press-escape="false" width="80%">
+             custom-class="ele-dialog-form" :close-on-click-modal="true" :close-on-press-escape="false" width="80%" :maxable="true">
     <div>
       <el-form :model="formData" ref="form" label-width="120px" class="ele-body" :rules="rules">
         <el-row :gutter="32">

src/views/productionPlan/components/currentDetailDialog.vue

@@ -6,6 +6,7 @@
     row-key="code"
     custom-class="ele-dialog-form"
     :title="'在途详情'"
+    :maxable="true"
   >
     <div class="form-wrapper">
 <!--      <el-form :model="requestData" label-width="0" :show-message="false">-->

src/views/productionPlan/components/disassemblePlanPop.vue

@@ -7,6 +7,7 @@
     row-key="code"
     custom-class="ele-dialog-form"
     :title="'计划分解'"
+    :maxable="true"
   >
     <div class="form-wrapper">
       <el-form :model="requestData" label-width="0" :show-message="false">

src/views/productionPlan/components/factoryAdd/index.vue

@@ -5,6 +5,7 @@
     :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="title"
+    :maxable="true"
   >
     <div class="form-wrapper">
       <el-form

src/views/productionPlan/components/mergeDialog.vue

@@ -6,6 +6,7 @@
     row-key="code"
     custom-class="ele-dialog-form"
     :title="'合批'"
+    :maxable="true"
   >
     <div class="form-wrapper">
 

src/views/productionPlan/components/stockDetailDialog.vue

@@ -6,6 +6,7 @@
     row-key="code"
     custom-class="ele-dialog-form"
     :title="'库存详情'"
+    :maxable="true"
   >
     <div class="form-wrapper">
 <!--      <el-form :model="requestData" label-width="0" :show-message="false">-->

src/views/productionPlan/components/unpackDetails.vue

@@ -6,6 +6,7 @@
     row-key="code"
     custom-class="ele-dialog-form"
     :title="title"
+    :maxable="true"
   >
     <div class="form-wrapper">
       <headerTitle :title="type == 1 ? '原数据' : ''"> </headerTitle>

src/views/productionPlan/components/unpackDialog.vue

@@ -6,6 +6,7 @@
     row-key="code"
     custom-class="ele-dialog-form"
     :title="'拆分计划'"
+    :maxable="true"
   >
     <div class="form-wrapper">
       <el-form :model="requestData" label-width="0" :show-message="false">

src/views/saleOrder/components/AdditionalOrder.vue

@@ -4,6 +4,7 @@
     title="追加订单"
     width="75vw"
     append-to-body
+    :maxable="true"
   >
     <el-form ref="form" :model="form" label-width="90px">
       <el-row :gutter="15">

src/views/saleOrder/components/create-order.vue

@@ -7,6 +7,7 @@
       :rules="rules"
       label-width="90px"
       class="create-form"
+      :maxable="true"
     >
       <el-row :gutter="15">
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

src/views/saleOrder/components/group-order.vue

@@ -4,6 +4,7 @@
     title="订单组合"
     width="70vw"
     append-to-body
+	:maxable="true"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="90px">
 		<el-row :gutter="15">

src/views/saleOrder/components/orderHomogeneityInspectDialog.vue

@@ -7,6 +7,7 @@
     row-key="code"
     custom-class="ele-dialog-form"
     :title="'齐套性检查'"
+    :maxable="true"
   >
     <div class="form-wrapper">
       <div v-if="leftShow" :style="{width: leftWidth}">

src/views/workOrder/components/unpackDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <ele-modal width="60vw" :visible.sync="visible" :close-on-click-modal="false" custom-class="ele-dialog-form"
+  <ele-modal width="60vw" :visible.sync="visible" :close-on-click-modal="false" custom-class="ele-dialog-form"     :maxable="true"
     :title="'拆分工单'">
     <div class="form-wrapper">
       <el-form :model="requestData" label-width="0" :show-message="false">

vue.config.js

@@ -33,8 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.210:86/',
         // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.144:18086',
+        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.144:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''