quwangxin 2 年之前
父节点
当前提交
89ec3ff33c

+ 1 - 1
src/components/CreatePlan/equipment-dailog.vue

@@ -153,8 +153,8 @@
         this.cancel();
       },
       cancel () {
+        this.$refs.table.clearSelection();
         this.visible = false;
-        this.$refs.table.clear;
       }
     }
   };

+ 1 - 1
src/views/productionPlan/components/plan-view.vue

@@ -144,7 +144,7 @@
             </template>
           </template></el-table-column
         >
-        <el-table-column label="操作" prop="">
+        <el-table-column label="操作" prop="" fixed="right">
           <template v-slot="{ $index }">
             <el-link type="danger" @click="handleDelete($index)">删除</el-link>
           </template>

+ 3 - 0
src/views/productionPlan/workOrderPublish.vue

@@ -108,6 +108,8 @@
 <script>
   import planView from './components/plan-view';
   import { getById, getReleaseInfoById } from '@/api/productionPlan/index';
+
+  import { removeLeftPageTab } from '@/utils/page-tab-util';
   export default {
     components: { planView },
     data () {
@@ -182,6 +184,7 @@
 
       this.type = query.type;
       this.id = query.id;
+
       if (query.type == 2) {
         this.getReleaseInfoById();
       } else {

+ 6 - 17
src/views/saleOrder/index.vue

@@ -134,14 +134,12 @@
             label: '产品编码',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 140
           },
           {
             prop: 'brandNo',
             label: '牌号',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
+            align: 'center'
           },
           {
             prop: 'model',
@@ -168,7 +166,6 @@
             label: '按单按库',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110,
             formatter: (_row, _column, cellValue) => {
               return this.getDictValue('按单按库', _row.orderLibraryType);
             }
@@ -178,7 +175,6 @@
             label: '交付要求',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110,
             formatter: (_row, _column, cellValue) => {
               return this.getDictValue('交付要求', _row.deliveryRequirements);
             }
@@ -188,7 +184,6 @@
             label: '订单类型',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110,
             formatter: (_row, _column, cellValue) => {
               return this.getDictValue('订单类型', _row.orderType);
             }
@@ -198,7 +193,6 @@
             label: '订单来源',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110,
             formatter: (_row, _column, cellValue) => {
               return this.getDictValue('订单来源', _row.orderSource);
             }
@@ -208,7 +202,6 @@
             label: '生产状态',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110,
             formatter: (_row, _column, cellValue) => {
               return this.getDictValue('生产状态', _row.status);
             }
@@ -217,29 +210,25 @@
             prop: 'releaseTime',
             label: '下达时间',
             align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
+            showOverflowTooltip: true
           },
           {
             prop: 'deliveryTime',
             label: '交付日期',
             align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
+            showOverflowTooltip: true
           },
           {
             prop: 'customerName',
             label: '客户名称',
             align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
+            showOverflowTooltip: true
           },
           {
             prop: 'salesman',
             label: '业务员',
             align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
+            showOverflowTooltip: true
           },
           ...privateColumn
         ];

+ 8 - 4
src/views/saleOrder/salesToProduction.vue

@@ -208,7 +208,9 @@
                   style="width: 100%"
                   v-model="scope.row.reqMoldTime"
                   :pickerOptions="{
-                    disabledDate: (time) => time.getTime() < Date.now()
+                    disabledDate: (time) =>
+                      time.getTime() <
+                      new Date(new Date().setHours(0, 0, 0, 0)).getTime()
                   }"
                   type="date"
                   placeholder="选择日期"
@@ -307,7 +309,6 @@
   } from '@/api/saleOrder';
   import dictMixins from '@/mixins/dictMixins';
   import { deepClone } from '@/utils/index';
-  import { finishPageTab, reloadPageTab } from '@/utils/page-tab-util';
   import dayjs from 'dayjs';
   export default {
     mixins: [dictMixins],
@@ -520,10 +521,13 @@
           } else {
             // 提交并发布
             this.$router.push({
-              path: '/productionPlan'
+              path: '/productionPlan/workOrderPublish',
+              query: {
+                type: 2,
+                id: res
+              }
             });
           }
-          finishPageTab();
         });
       }
     }