quwangxin %!s(int64=2) %!d(string=hai) anos
pai
achega
33fcd489b1

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

@@ -92,7 +92,7 @@
         return list;
       },
       datasourceShow () {
-        return this.datasource.filter((item) => {
+        return this.datasource?.filter((item) => {
           if (this.name) {
             return item.name.includes(this.name);
           }
@@ -136,7 +136,7 @@
           name: this.name,
           productionId: this.produceVersionId
         });
-        this.datasource = data;
+        this.datasource = data || [];
       },
       confirm () {
         if (this.isSingle) {

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

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

+ 5 - 2
src/views/productionPlan/workOrderPublish.vue

@@ -41,8 +41,11 @@
           >{{ infoData.requiredFormingNum }}PCS</el-descriptions-item
         >
         <el-descriptions-item label="要求成型重量"
-          >{{ infoData.requiredFormingWeight
-          }}{{ infoData.productUnitWeight }}</el-descriptions-item
+          >{{
+            (
+              infoData.requiredFormingWeight * infoData.productUnitWeight
+            ).toFixed(4)
+          }}kg</el-descriptions-item
         >
       </el-descriptions>