Kaynağa Gözat

🦄 refactor(日报): 调整

Zimo 3 gün önce
ebeveyn
işleme
29c497bb00

+ 1 - 1
src/views/pms/iotrhdailyreport/approval.vue

@@ -58,7 +58,7 @@ const columns = ref<Column[]>([
     label: '日期',
     prop: 'createTime',
     'min-width': '120px',
-    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')
+    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD')
   },
   {
     label: '施工队伍',

+ 13 - 13
src/views/pms/iotrhdailyreport/fill.vue

@@ -58,7 +58,7 @@ const columns = ref<Column[]>([
     label: '日期',
     prop: 'createTime',
     'min-width': '120px',
-    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')
+    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD')
   },
   {
     label: '施工队伍',
@@ -148,18 +148,18 @@ const columns = ref<Column[]>([
     isTag: true,
     dictType: DICT_TYPE.PMS_PROJECT_NPT_REASON
   },
-  {
-    label: '施工开始日期',
-    prop: 'constructionStartDate',
-    'min-width': '120px',
-    formatter: (row: List) => dayjs(row.constructionStartDate).format('YYYY-MM-DD HH:mm:ss')
-  },
-  {
-    label: '施工结束日期',
-    prop: 'constructionEndDate',
-    'min-width': '120px',
-    formatter: (row: List) => dayjs(row.constructionEndDate).format('YYYY-MM-DD HH:mm:ss')
-  },
+  // {
+  //   label: '施工开始日期',
+  //   prop: 'constructionStartDate',
+  //   'min-width': '120px',
+  //   formatter: (row: List) => dayjs(row.constructionStartDate).format('YYYY-MM-DD HH:mm:ss')
+  // },
+  // {
+  //   label: '施工结束日期',
+  //   prop: 'constructionEndDate',
+  //   'min-width': '120px',
+  //   formatter: (row: List) => dayjs(row.constructionEndDate).format('YYYY-MM-DD HH:mm:ss')
+  // },
   {
     label: '生产动态',
     prop: 'productionStatus',

+ 1 - 1
src/views/pms/iotrydailyreport/approval.vue

@@ -88,7 +88,7 @@ const columns = ref<Column[]>([
     label: '日期',
     prop: 'createTime',
     'min-width': '120px',
-    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')
+    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD')
   },
   {
     label: '施工队伍',

+ 13 - 13
src/views/pms/iotrydailyreport/fill.vue

@@ -88,7 +88,7 @@ const columns = ref<Column[]>([
     label: '日期',
     prop: 'createTime',
     'min-width': '120px',
-    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')
+    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD')
   },
   {
     label: '施工队伍',
@@ -199,18 +199,18 @@ const columns = ref<Column[]>([
       }
     ]
   },
-  {
-    label: '施工开始日期',
-    prop: 'constructionStartDate',
-    'min-width': '120px',
-    formatter: (row: List) => dayjs(row.constructionStartDate).format('YYYY-MM-DD HH:mm:ss')
-  },
-  {
-    label: '施工结束日期',
-    prop: 'constructionEndDate',
-    'min-width': '120px',
-    formatter: (row: List) => dayjs(row.constructionEndDate).format('YYYY-MM-DD HH:mm:ss')
-  },
+  // {
+  //   label: '施工开始日期',
+  //   prop: 'constructionStartDate',
+  //   'min-width': '120px',
+  //   formatter: (row: List) => dayjs(row.constructionStartDate).format('YYYY-MM-DD HH:mm:ss')
+  // },
+  // {
+  //   label: '施工结束日期',
+  //   prop: 'constructionEndDate',
+  //   'min-width': '120px',
+  //   formatter: (row: List) => dayjs(row.constructionEndDate).format('YYYY-MM-DD HH:mm:ss')
+  // },
   {
     label: '水平段长度(m)',
     prop: 'lateralLength',

+ 2 - 4
src/views/pms/iotrydailyreport/xapproval.vue

@@ -63,7 +63,7 @@ const columns = ref<Column[]>([
     label: '日期',
     prop: 'createTime',
     'min-width': '120px',
-    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')
+    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD')
   },
   {
     label: '施工队伍',
@@ -507,10 +507,8 @@ const sumTimes = () => {
 
 const validateTotalTime = (_rule: any, _value: any, callback: any) => {
   const total = sumTimes()
-  console.log('total :>> ', total)
-  console.log('form.value.ratedProductionTime :>> ', form.value.ratedProductionTime)
   if (total !== form.value.ratedProductionTime) {
-    callback(new Error(`生产时间和非生产时间,时间之和必须等于额定生产时间`))
+    callback(new Error(`生产时间和非生产时间之和必须等于额定生产时间`))
   } else {
     callback()
   }

+ 14 - 14
src/views/pms/iotrydailyreport/xfill.vue

@@ -63,7 +63,7 @@ const columns = ref<Column[]>([
     label: '日期',
     prop: 'createTime',
     'min-width': '120px',
-    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')
+    formatter: (row: List) => dayjs(row.createTime).format('YYYY-MM-DD')
   },
   {
     label: '施工队伍',
@@ -139,18 +139,18 @@ const columns = ref<Column[]>([
       }
     ]
   },
-  {
-    label: '施工开始日期',
-    prop: 'constructionStartDate',
-    'min-width': '120px',
-    formatter: (row: List) => dayjs(row.constructionStartDate).format('YYYY-MM-DD HH:mm:ss')
-  },
-  {
-    label: '施工结束日期',
-    prop: 'constructionEndDate',
-    'min-width': '120px',
-    formatter: (row: List) => dayjs(row.constructionEndDate).format('YYYY-MM-DD HH:mm:ss')
-  },
+  // {
+  //   label: '施工开始日期',
+  //   prop: 'constructionStartDate',
+  //   'min-width': '120px',
+  //   formatter: (row: List) => dayjs(row.constructionStartDate).format('YYYY-MM-DD HH:mm:ss')
+  // },
+  // {
+  //   label: '施工结束日期',
+  //   prop: 'constructionEndDate',
+  //   'min-width': '120px',
+  //   formatter: (row: List) => dayjs(row.constructionEndDate).format('YYYY-MM-DD HH:mm:ss')
+  // },
   {
     label: '目前工序',
     prop: 'currentOperation',
@@ -510,7 +510,7 @@ const validateTotalTime = (_rule: any, _value: any, callback: any) => {
   console.log('total :>> ', total)
   console.log('form.value.ratedProductionTime :>> ', form.value.ratedProductionTime)
   if (total !== form.value.ratedProductionTime) {
-    callback(new Error(`生产时间和非生产时间,时间之和必须等于额定生产时间`))
+    callback(new Error(`生产时间和非生产时间之和必须等于额定生产时间`))
   } else {
     callback()
   }