diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue index 589ae9f..a4dac2b 100644 --- a/src/views/cost/csotSettlement/component/finishAndDetails.vue +++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue @@ -14,67 +14,75 @@ + + @@ -92,6 +100,7 @@ diff --git a/src/views/cost/csotSettlement/component/finishTable.vue b/src/views/cost/csotSettlement/component/finishTable.vue index df04fca..4896851 100644 --- a/src/views/cost/csotSettlement/component/finishTable.vue +++ b/src/views/cost/csotSettlement/component/finishTable.vue @@ -114,7 +114,7 @@ type="date" placeholder="选择日期" v-if="t.t_slot === 't_date'" - value-format="yyyy-MM-dd" + value-format="yyyy-MM-dd HH:mm:ss" :ref="`editTime_${scope.$index}`" :class="{ active: activeIndexTime === scope.$index, @@ -374,6 +374,7 @@ export default { } .title { + margin: auto 0; text-align: center; font-size: 20px; font-weight: bold; diff --git a/src/views/cost/csotSettlement/component/other-cost.vue b/src/views/cost/csotSettlement/component/other-cost.vue new file mode 100644 index 0000000..71b569b --- /dev/null +++ b/src/views/cost/csotSettlement/component/other-cost.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue index 93d6928..f13af02 100644 --- a/src/views/cost/csotSettlement/costApplyList.vue +++ b/src/views/cost/csotSettlement/costApplyList.vue @@ -149,7 +149,7 @@ size="mini" :type="row.isSlt == 1 ? 'success' : 'primary'" style="padding: 5px 10px" - @click="handleFinishCostAndDetails(row)" + @click="handleFinishCostAndDetails(row, row.isSlt)" >{{ row.isSlt == 1 ? '结算明细' : '完工结算' }} - + - + +
+

以上工机具均确认完好、无误、能够正常使用

@@ -244,4 +246,8 @@ h1 { font-size: 16px; letter-spacing: 4px; } + +.remarks { + color: transparent; +} diff --git a/src/views/stquery/projUsingRecord.vue b/src/views/stquery/projUsingRecord.vue index 74b299b..facbea4 100644 --- a/src/views/stquery/projUsingRecord.vue +++ b/src/views/stquery/projUsingRecord.vue @@ -8,7 +8,7 @@ v-show="showSearch" label-width="80px" > - + @@ -41,7 +40,6 @@ @@ -94,7 +92,11 @@ @keyup.enter.native="handleQuery" /> - + + 在用 + diff --git a/src/views/warehouseManage/machinery/supplier/index.vue b/src/views/warehouseManage/machinery/supplier/index.vue index 2b9638a..4afdc84 100644 --- a/src/views/warehouseManage/machinery/supplier/index.vue +++ b/src/views/warehouseManage/machinery/supplier/index.vue @@ -165,7 +165,7 @@ - - + --> \ No newline at end of file +