完善

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

@@ -229,6 +229,7 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-date-picker
+              disabled
               style="width: 100%"
               :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
               v-decorator="['nextDate']" />

src/views/repair/application-form/RepairApplicationForm.vue

@@ -301,8 +301,8 @@ export default {
           ...this.queryParam,
           type: 1,
           dataScope: {
-            sortBy: 'desc',
+            sortBy: 'desc, asc',
-            sortName: 'apply_time'
+            sortName: 'apply_time, status'
           }
         }
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))

src/views/repair/application-form/RepairCheckForm.vue

@@ -278,8 +278,8 @@ export default {
           ...parameter,
           ...this.queryParam,
           dataScope: {
-            sortBy: 'desc',
+            sortBy: 'desc, asc',
-            sortName: 'apply_time'
+            sortName: 'apply_time, status'
           }
         }
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))

src/views/repair/application-form/RepairForm.vue

@@ -312,8 +312,8 @@ export default {
           ...this.queryParam,
           type: 1,
           dataScope: {
-            sortBy: 'desc',
+            sortBy: 'desc, asc',
-            sortName: 'apply_time'
+            sortName: 'apply_time, status'
           }
         }
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))

src/views/repair/application-form/RepairOut.vue

@@ -207,8 +207,8 @@ export default {
           ...this.queryParam,
           type: 2,
           dataScope: {
-            sortBy: 'desc',
+            sortBy: 'desc, asc',
-            sortName: 'apply_time'
+            sortName: 'apply_time, status'
           }
         }
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))

src/views/repair/application-form/modules/DetailCheck.vue

@@ -4,7 +4,7 @@
       <a-row :gutter="48" slot="extra">
         <a-col :md="48" :sm="48">
           <span class="table-page-search-submitButtons" style="float: right">
-            <a-button v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING < model.status" style="margin-left: 8px" type="primary" @click="handleEdit()">修改</a-button>
+            <a-button v-if="$auth('repair-application-forms-edit')" style="margin-left: 8px" type="primary" @click="handleEdit()">修改</a-button>
             <a-popconfirm v-if="$auth('repair-application-forms-approve') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" title="是否要接受？" @confirm="handleApprove">
               <a-button :loading="confirmLoading" style="margin-left: 8px" type="primary">接受</a-button>
             </a-popconfirm>

src/views/repair/application-form/modules/DetailRepair.vue

@@ -13,7 +13,7 @@
             <a-button v-if="$auth('repair-application-forms-out') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING >= model.status) && model.type != 2" style="margin-left: 8px" type="primary" @click="handleOut">委外</a-button>
             <a-button v-if="$auth('repair-application-forms-dispatch') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status" style="margin-left: 8px" type="primary" @click="handleDispatch">转派</a-button>
             <a-button v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="primary" @click="handleFinish()">完成</a-button>
-            <a-button v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING < model.status" style="margin-left: 8px" type="primary" @click="handleFinish()">修改</a-button>
+            <a-button v-if="$auth('repair-application-forms-edit')" style="margin-left: 8px" type="primary" @click="handleFinish()">修改</a-button>
             <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.WAIT_SUBMIT === model.status" title="是否要提交审核该条数据？" @confirm="handleExamine">
               <a-button style="margin-left: 8px" type="primary">提交审核</a-button>
             </a-popconfirm>

src/views/sb/info/MeasureSbInfoWarn.vue

@@ -177,38 +177,47 @@ export default {
         {
           title: '序号',
           dataIndex: 'index',
+          width: 50,
           checked: true,
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
         {
-          title: '设备名称',
+          title: '设备新号',
-          checked: true,
+          dataIndex: 'no',
-          dataIndex: 'name'
+          width: 120,
+          checked: true
         },
+        /*        {
+                  title: '设备旧号',
+                  dataIndex: 'zbh',
+                  width: 120,
+                  checked: true
+                },*/
         {
-          title: '设备编号',
+          title: '测量设备编号',
-          dataIndex: 'no',
+          dataIndex: 'cardNo',
+          width: 150,
           checked: true
         },
         {
-          title: '设备型号',
+          title: '设备名称',
           checked: true,
           width: 200,
-          dataIndex: 'model'
+          dataIndex: 'name'
         },
         {
-          title: '使用位置',
+          title: '设备型号',
           checked: true,
           width: 200,
-          dataIndex: 'cph'
+          dataIndex: 'model'
         },
         {
-          title: '存放位置',
+          title: '使用位置',
           checked: true,
           width: 200,
-          dataIndex: 'positionId'
+          dataIndex: 'cph'
         },
         {
           title: '使用部门',
@@ -220,6 +229,7 @@ export default {
           title: '设备类型',
           checked: true,
           dataIndex: 'type',
+          width: 120,
           customRender: (text, record, index) => {
             return record.typeName
           }
@@ -228,42 +238,87 @@ export default {
           title: '设备等级',
           checked: true,
           dataIndex: 'level',
+          width: 120,
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.levelMap, text)
           }
         },
+
         {
           title: '设备原值',
           dataIndex: 'initialValue',
+          width: 100,
           customRender: (text, record, index) => {
             return this.BaseTool.Amount.formatter(text)
           }
         },
         {
           title: '购置日期',
-          dataIndex: 'buyDate'
+          dataIndex: 'buyDate',
+          width: 120,
+          checked: true
         },
         {
           title: '投用日期',
-          dataIndex: 'startDate'
+          dataIndex: 'startDate',
+          width: 120,
+          checked: true
         },
         {
-          title: '下次检定日期',
+          title: '检定日期',
-          dataIndex: 'nextCheckDate'
+          dataIndex: 'checkDate',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定周期',
+          dataIndex: 'checkPeriod',
+          width: 100,
+          checked: true,
+          customRender: (text, record, index) => {
+            if (record.nextCheckDate == null) {
+              return '未知'
+            } else {
+              return text + '月'
+            }
+          }
+        },
+        {
+          title: '检定有效期',
+          dataIndex: 'nextCheckDate',
+          width: 150,
+          fixed: 'right',
+          checked: true
+        },
+        {
+          title: '检定截止',
+          dataIndex: 'restDay',
+          width: 100,
+          fixed: 'right',
+          checked: true,
+          customRender: (text, record, index) => {
+            if (record.nextCheckDate == null) {
+              return '未知'
+            } else {
+              return this.BaseTool.Date.getCountBetween(new Date(), record.nextCheckDate, 1) + '天'
+            }
+          }
         },
-
         {
           title: '状态',
           checked: true,
           dataIndex: 'status',
+          width: 100,
+          fixed: 'right',
           scopedSlots: { customRender: 'status' }
         },
         {
           title: '操作',
           key: 'action',
           checked: true,
+          fixed: 'right',
           align: 'center',
-          width: '300',
+          width: '100',
           scopedSlots: { customRender: 'action' }
         }
       ],

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

@@ -133,7 +133,7 @@
           >
             <a-textarea
               :rows="4"
-              v-decorator="['requirement', {rules: [{required: true, message: '备注不能为空'}]}]"/>
+              v-decorator="['requirement', {rules: [{required: false, message: '备注不能为空'}]}]"/>
           </a-form-item>
         </row-item>
       </row-list>
@@ -465,7 +465,7 @@ export default {
     this.enableMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
   },
   methods: {
-    base (record, sbId) {
+    base (record, sbInfo) {
       this.visible = true
       queryUser({}).then(res => {
         this.userList = res.data
@@ -475,11 +475,11 @@ export default {
         this.modalTitle = '添加'
         this.data = []
         this.cacheData = []
-        if (sbId != null) {
+        if (sbInfo != null) {
           const { form: { setFieldsValue } } = this
           // 日期处理
           this.$nextTick(() => {
-            setFieldsValue({ sbId: sbId })
+            setFieldsValue({ sbId: sbInfo.id, sbNo: sbInfo.no, sbName: sbInfo.name })
           })
         }
         return

src/views/sb/measurelog/modules/DetailSbCheck.vue

@@ -163,7 +163,7 @@ export default {
     },
     handleAdd () {
       const modal = this.$refs.baseModal
-      modal.base(null, this.model.id)
+      modal.base(null, this.model)
     },
     handleView (record) {
       fetchCheckStandard({ id: record.id }).then(res => {