66

src/views/productionPlan/index.vue

@@ -401,7 +401,8 @@
             prop: 'produceRoutingName',
             label: '工艺路线',
             align: 'center',
-            minWidth: 120
+            width: 140,
+            showOverflowTooltip: true
           },
 
           {
@@ -518,8 +519,24 @@
             prop: 'reqMoldTime',
             label: '计划完成日期',
             align: 'center',
+            width: 110,
+            showOverflowTooltip: true
+          },
 
-            minWidth: 110
+          {
+            prop: 'reqMoldTime',
+            label: '计划完成日期',
+            align: 'center',
+            width: 110,
+            showOverflowTooltip: true
+          },
+
+          {
+            prop: 'reqMoldTime',
+            label: '计划完成日期',
+            align: 'center',
+            width: 110,
+            showOverflowTooltip: true
           },
 
           ...opt[this.activeName],
@@ -545,8 +562,8 @@
             prop: 'createTime',
             label: '创建时间',
             align: 'center',
-
-            minWidth: 110
+            width: 110,
+            showOverflowTooltip: true
           },
           {
             columnKey: 'status',

src/views/saleOrder/salesToProduction.vue

@@ -411,6 +411,42 @@
                 <el-date-picker
                   style="width: 100%"
                   v-model="scope.row.reqMoldTime"
+                  :pickerOptions="{
+                    disabledDate: (time) =>
+                      time.getTime() <
+                      new Date(new Date().setHours(0, 0, 0, 0)).getTime() 
+              
+                  }"
+                  type="date"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+                >
+                </el-date-picker>
+   
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="计划开始日期"
+            align="center"
+            prop="startTime"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <el-form-item
+                label-width="0px"
+                :prop="'salesOrders.' + scope.$index + '.startTime'"
+                :rules="{
+                  required: true,
+                  message: '请选择计划开始日期',
+                  trigger: 'blur'
+                }"
+                class="table-item"
+              >
+                <el-date-picker
+                  style="width: 100%"
+                  v-model="scope.row.startTime"
                   :pickerOptions="{
                     disabledDate: (time) =>
                       time.getTime() <
@@ -425,6 +461,47 @@
               </el-form-item>
             </template>
           </el-table-column>
+
+
+          <el-table-column
+            label="计划结束日期"
+            align="center"
+            prop="endTime"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <el-form-item
+                label-width="0px"
+                :prop="'salesOrders.' + scope.$index + '.endTime'"
+                :rules="[
+                  {
+                  required: true,
+                  message: '计划结束日期',
+                  trigger: 'blur'
+                },
+              
+                ]"
+                class="table-item"
+              >
+                <el-date-picker
+                  style="width: 100%"
+                  v-model="scope.row.endTime"
+                  :pickerOptions="{
+                    disabledDate: (time) =>
+                      time.getTime() <
+                      new Date(new Date().setHours(0, 0, 0, 0)).getTime() 
+           
+                  }"
+                  type="date"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+                >
+                </el-date-picker>
+   
+              </el-form-item>
+            </template>
+          </el-table-column>
+
           <el-table-column label="客户名称" align="center" prop="customerName">
           </el-table-column>
           <el-table-column label="业务员" align="center" prop="salesman">
@@ -626,6 +703,8 @@ export default {
     }
   },
   methods: {
+
+
     async getPlanInfo(id) {
       const data = await getUpdateInfoById(id);
       this.form = data;
@@ -633,7 +712,6 @@ export default {
       this.getPlanRouting()
       this.bomListVersion()
 
-    
     },
     async _getInventory() {
       const res = await getInventory(this.form.productCode, this.form.planType);