优化

src/views/check/checkjob/modules/BaseForm.vue

@@ -233,7 +233,7 @@
           >
             <a-textarea
               :rows="4"
-              v-decorator="['feedback', {rules: [{required: true, message: '检查结果不能为空'}]}]"/>
+              v-decorator="['feedback']"/>
           </a-form-item>
         </row-item>
       </row-list>

src/views/check/checkstandard/modules/BaseFormInsert.vue

@@ -198,7 +198,7 @@ export default {
           this.confirmLoading = false
           return
         }
-        values.startTime = BaseTool.Date.formatter(values.startTime, BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+        values.startTime = BaseTool.Date.formatter(values.startTime, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         if (this.BaseTool.String.isBlank(values.id)) {
           generateJobByCheckStandard(values)
             .then(() => {

src/views/repair/fee/modules/BaseForm.vue

@@ -10,6 +10,7 @@
 
       <a-form-item v-show="false" >
         <a-input v-decorator="['id']" type="hidden"/>
+        <a-input v-decorator="['sbId']" type="hidden"/>
       </a-form-item>
 
       <a-form-item
@@ -186,6 +187,7 @@ export default {
       if (this.BaseTool.Object.isBlank(record)) {
         this.$nextTick(() => {
           setFieldsValue({
+            'sbId': repairForm.sbId,
             'repairId': repairForm.id,
             'repairNo': repairForm.outNo
           })
@@ -215,6 +217,7 @@ export default {
         setFieldsValue(Object.assign(pick(record, [
           'id',
           'repairId',
+          'sbId',
           'repairNo',
           'fee',
           'moneyType',

src/views/repair/fee/modules/RepairFeeTable.vue

@@ -22,7 +22,7 @@
       <a-button
         type="primary"
         icon="plus"
-        @click="$refs.baseModal.base(null,modelParams)">新增</a-button>
+        @click="$refs.baseModal.base(null,tableParams)">新增</a-button>
       <a-dropdown v-action:edit>
         <a-menu slot="overlay">
           <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">

src/views/sb/info/modules/BaseForm.vue

@@ -491,6 +491,22 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="使用寿命"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              style="width: 100%"
+              suffix="年"
+              :formatter="BaseTool.Amount.formatter"
+              :parser="BaseTool.Amount.parser"
+              v-decorator="['workYear']" />
+          </a-form-item>
+        </a-col>
+      </a-row>
       <title-divider title="资产编号" width="90px"></title-divider>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
@@ -619,20 +635,6 @@
           </a-col>
         </a-row>
         <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-          <a-col :lg="12" :md="24" :sm="24">
-            <a-form-item
-              label="预计工作年限"
-              :labelCol="BaseTool.Constant.labelCol"
-              :wrapperCol="BaseTool.Constant.wrapperCol"
-            >
-              <a-input
-                style="width: 100%"
-                suffix="年"
-                :formatter="BaseTool.Amount.formatter"
-                :parser="BaseTool.Amount.parser"
-                v-decorator="['workYear']" />
-            </a-form-item>
-          </a-col>
           <a-col :lg="12" :md="24" :sm="24">
             <a-form-item
               label="设计到期年限"

src/views/sb/info/modules/Detail.vue

@@ -45,6 +45,7 @@
         <detail-list-item term="生产商">{{ model.producerName }}</detail-list-item>
         <detail-list-item term="大小尺寸">{{ model.zz }}</detail-list-item>
         <detail-list-item term="系列号(出厂编号)">{{ model.zzh }}</detail-list-item>
+        <detail-list-item term="使用寿命">{{ model.workYear }}</detail-list-item>
         <detail-list-item term="是否显示">{{ model.isShow?'显示':'不显示' }}</detail-list-item>
         <detail-list-item v-show="model.isChild == 1" term="是否子设备">子设备</detail-list-item>
         <detail-list-item v-show="model.isChild == 2" term="是否子设备">父设备</detail-list-item>
@@ -77,7 +78,6 @@
         <detail-list-item term="使用登记证编号">{{ model.usedNo }}</detail-list-item>
         <detail-list-item term="维护供应商">{{ model.supplier }}</detail-list-item>
         <detail-list-item term="设备批号">{{ model.batchNo }}</detail-list-item>
-        <detail-list-item term="预计工作年限">{{ model.workYear }}</detail-list-item>
         <detail-list-item term="设计到期年限">{{ model.retirementDate }}</detail-list-item>
         <detail-list-item term="登记日期">{{ model.registerDate }}</detail-list-item>
       </detail-list>