ly 1 tahun lalu
induk
melakukan
905a2f8d45

+ 4 - 4
src/views/business/entrust/workOrder/historyMonth/index.vue

@@ -9,8 +9,8 @@
             label-width="68px">
             <el-form-item label="工作月:">
                 <el-date-picker v-model="queryParams.date" 
-                    format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="month" placeholder="请选择工作月"
-                    style="width: 150px" />
+                    format="YYYY-MM" value-format="YYYY-MM-DD" type="month" placeholder="请选择工作月"
+                    style="width: 150px"  :disabled-date="disabledDate"/>
   
             </el-form-item>
             <el-form-item label="客户名称:" prop="companyName">
@@ -53,7 +53,7 @@
                 <template #default="scope">
                     {{
                     scope.row.type === 1
-                    ? scope.row.startMonth
+                    ? scope.row.startMonth !="0000-00-00"
                     ? moment(scope.row.startMonth).format("YYYY年MM月")
                     : ""
                     : "-"
@@ -64,7 +64,7 @@
                 <template #default="scope">
                     {{
                     scope.row.type === 1
-                    ? scope.row.endMonth
+                    ? scope.row.endMonth !="0000-00-00"
                     ? moment(scope.row.endMonth).format("YYYY年MM月")
                     : ""
                     : "-"

+ 3 - 6
src/views/business/entrust/workOrderForFactory/history/index.vue

@@ -8,10 +8,7 @@
       <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
           label-width="68px">
           <el-form-item label="工作月:">
-              <!-- <el-date-picker v-model="queryParams.date" 
-                  format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="month" placeholder="请选择工作月"
-                  style="width: 150px" /> -->
-              <el-date-picker v-model="queryParams.date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="month"
+              <el-date-picker v-model="queryParams.date" format="YYYY-MM" value-format="YYYY-MM-DD" type="month"
                   placeholder="请选择工作月" :disabled-date="disabledDate"></el-date-picker>
           </el-form-item>
           <el-form-item label="客户名称:" prop="companyName">
@@ -54,7 +51,7 @@
               <template #default="scope">
                   {{
                   scope.row.type === 1
-                  ? scope.row.startMonth
+                  ? scope.row.startMonth !="0000-00-00"
                   ? moment(scope.row.startMonth).format("YYYY年MM月")
                   : ""
                   : "-"
@@ -65,7 +62,7 @@
               <template #default="scope">
                   {{
                   scope.row.type === 1
-                  ? scope.row.endMonth
+                  ? scope.row.endMonth !="0000-00-00"
                   ? moment(scope.row.endMonth).format("YYYY年MM月")
                   : ""
                   : "-"