bug

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

@@ -16,11 +16,7 @@
     >
       <el-row :gutter="32">
         <el-col :span="12">
-          <el-form-item
-            label="选择物料"
-            prop="materialName"
-            :key="formData.materialName"
-          >
+          <el-form-item label="选择物料" prop="materialName">
             <el-input
               placeholder="请选择"
               :value="
@@ -190,12 +186,14 @@
         this.$refs.chooseRef.open(this.formData.categoryId);
       },
       handleChooseMaterial (row) {
-        this.formData.materialName = row.name;
-        this.formData.categoryId = row.id;
-        this.formData.materialCode = row.code;
-        this.formData.brandNo = row.brandNum;
-        this.formData.model = row.modelType;
-        this.formData.unit = row.measuringUnit;
+        this.formData = Object.assign({}, this.formData, {
+          materialName: row.name,
+          categoryId: row.id,
+          materialCode: row.code,
+          brandNo: row.brandNum,
+          model: row.modelType,
+          unit: row.measuringUnit
+        });
       },
       confirm () {
         this.$refs.formRef.validate(async (value) => {

src/views/materialPlan/components/plan-view.vue

@@ -74,7 +74,15 @@
                 :clearable="false"
                 v-model="row.planStartTime"
                 :pickerOptions="{
-                  disabledDate: (time) => time.getTime() >= row.planCompleteDate
+                  disabledDate: (time) =>
+                    (row.planCompleteDate
+                      ? time.getTime() >=
+                        new Date(
+                          new Date(row.planCompleteDate).setHours(0, 0, 0, 0)
+                        ).getTime()
+                      : true) &&
+                    time.getTime() <
+                      new Date(new Date().setHours(0, 0, 0, 0)).getTime()
                 }"
                 type="date"
                 placeholder="选择日期"

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

@@ -92,8 +92,14 @@
                 v-model="row.planStartTime"
                 :pickerOptions="{
                   disabledDate: (time) =>
+                    (row.planCompleteDate
+                      ? time.getTime() >=
+                        new Date(
+                          new Date(row.planCompleteDate).setHours(0, 0, 0, 0)
+                        ).getTime()
+                      : true) &&
                     time.getTime() <
-                    new Date(new Date().setHours(0, 0, 0, 0)).getTime()
+                      new Date(new Date().setHours(0, 0, 0, 0)).getTime()
                 }"
                 type="date"
                 placeholder="选择日期"