优化

src/router/generator-platform-routers.js

@@ -170,7 +170,7 @@ const constantRouterComponents = {
   // 调拨详情
   'TransferStoreDetail': () => import('@/views/store/transferstoredetail/TransferStoreDetail'),
   // 报修单
-  'RepairApplicationForm': () => import('@/views/repair/application-form/RepairApplicationForm'),
+  // 'RepairApplicationForm': () => import('@/views/repair/application-form/RepairApplicationForm'),
   // 报修单待审核
   // 'RepairApplicationFormExamining': () => import('@/views/repair/application-form/RepairApplicationFormExamining'),
   // 报修单已审核

src/views/check/checkjob/CheckJob.vue

@@ -5,8 +5,18 @@
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="6" :sm="24">
-              <a-form-item label="负责人">
-                <a-input v-model="queryParam.keyword" placeholder="请输入设备新号/名称"/>
+              <a-form-item label="关键字">
+                <a-input v-model="queryParam.keyword" placeholder="请输入设备名称/设备新号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="设备旧号">
+                <a-input v-model="queryParam.zbh" placeholder="请输入设备旧号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="执行人姓名">
+                <a-input v-model="queryParam.actualUser" placeholder="请输入执行人姓名"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

src/views/check/checkstandard/CheckStandard.vue

@@ -74,7 +74,7 @@
       size="default"
       rowKey="id"
       :columns="columns"
-      :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
+      :scroll="{x: 1500, y: BaseTool.Constant.scrollY }"
       :data="loadData"
       :alert="options.alert"
       :rowSelection="options.rowSelection"
@@ -180,10 +180,21 @@ export default {
           width: '200px'
         },
         {
-          title: '标准名称',
-          dataIndex: 'name',
+          title: '标准内容',
+          dataIndex: 'requirement',
           checked: true,
-          width: '250px'
+          width: '250px',
+          customRender: (text, record, index) => {
+            if (text != null) {
+              if (text.length > 40) {
+                return text.slice(0, 40)
+              } else {
+                return text
+              }
+            } else {
+              return text
+            }
+          }
         },
         {
           title: '计划周期',
@@ -195,17 +206,17 @@ export default {
           }
         },
         {
-          title: '上次执行日期',
-          dataIndex: 'lastDate',
-          fixed: 'right',
+          title: '预计下次执行日期',
+          dataIndex: 'nextDate',
           checked: true,
           width: '200px'
         },
         {
-          title: '预计下次执行日期',
-          dataIndex: 'nextDate',
+          title: '上次执行日期',
+          dataIndex: 'lastDate',
+          fixed: 'right',
           checked: true,
-          width: '250px'
+          width: '200px'
         },
         {
           title: '操作',

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

@@ -39,7 +39,7 @@
             <a-button type="primary" style="width: 20%" @click="handleSbSelect">选择</a-button>
           </a-form-item>
         </row-item>
-        <row-item>
+<!--        <row-item>
           <a-form-item
             label="标准名称"
             :labelCol="BaseTool.Constant.labelCol"
@@ -48,7 +48,7 @@
             <a-input
               v-decorator="['name', {rules: [{required: true, message: '标准名称不能为空'}]}]"/>
           </a-form-item>
-        </row-item>
+        </row-item>-->
         <row-item>
           <a-form-item
             label="检查部位"
@@ -167,7 +167,7 @@
               v-decorator="['sort', {initialValue: 1,rules: [{required: true, message: '排序不能为空'}]}]"/>
           </a-form-item>
         </row-item>
-        <!--        <row-item>
+        <row-item>
           <a-form-item
             label="动作类型"
             :labelCol="BaseTool.Constant.labelCol"
@@ -186,7 +186,7 @@
           </a-form-item>
         </row-item>
 
-        <row-item>
+        <!--       <row-item>
           <a-form-item
             v-show="false"
             label="是否启用"
@@ -243,7 +243,7 @@
               v-decorator="['requirement', {rules: [{required: true, message: '检查项目不能为空'}]}]"/>
           </a-form-item>
         </row-item>
-        <row-item>
+<!--        <row-item>
           <a-form-item
             label="操作说明及标准"
             :labelCol="BaseTool.Constant.labelCol2"
@@ -253,7 +253,7 @@
               :rows="4"
               v-decorator="['remark', {rules: [{required: false, message: '操作说明及标准不能为空'}]}]"/>
           </a-form-item>
-        </row-item>
+        </row-item>-->
       </row-list>
       <row-list :col="2">
         <row-item>

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

@@ -7,7 +7,7 @@
     @cancel="handleCancel"
   >
     <detail-list title="" :col="2">
-      <detail-list-item term="标准名称">{{ model.name }}</detail-list-item>
+<!--      <detail-list-item term="标准名称">{{ model.name }}</detail-list-item>-->
       <detail-list-item term="排序">{{ model.sort }}</detail-list-item>
 <!--      <detail-list-item term="编码">{{ model.no }}</detail-list-item>-->
       <detail-list-item term="检查类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
@@ -98,7 +98,7 @@ export default {
       actionTypeMap: {},
       enableMap: {},
       model: {
-        'name': null,
+       /* 'name': null,*/
         'no': null,
         'type': null,
         'part': null,

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

@@ -136,10 +136,21 @@ export default {
           dataIndex: 'partName'
         },
         {
-          title: '名称',
-          dataIndex: 'name',
+          title: '标准内容',
+          dataIndex: 'requirement',
           checked: true,
-          width: '200px'
+          width: '250px',
+          customRender: (text, record, index) => {
+            if (text != null) {
+              if (text.length > 40) {
+                return text.slice(0, 40)
+              } else {
+                return text
+              }
+            } else {
+              return text
+            }
+          }
         },
         {
           title: '周期',

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

@@ -1,316 +1,17 @@
 <template>
-  <a-card :bordered="false">
-    <div v-show="visible">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="关键字">
-                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-
-      <div class="table-operator">
-        <!--        <a-button v-if="$auth('repair-application-forms-add')" type="primary" icon="plus" @click="$refs.baseModal.base({},{filter: -1})">新增</a-button>-->
-        <a-button style="margin-left: 8px" v-if="$auth('repair-application-forms-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-        <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('repair-application-forms-del')">
-          <a-menu slot="overlay">
-            <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
-              <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-            </a-popconfirm>
-          </a-menu>
-          <a-button style="margin-left: 8px">
-            批量操作 <a-icon type="down" />
-          </a-button>
-        </a-dropdown>
-      </div>
-
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :alert="options.alert"
-        :rowSelection="options.rowSelection"
-        showPagination="auto"
-      >
-        <span slot="action" slot-scope="record">
-          <template>
-            <a @click="handleView(record)">查看</a>
-
-            <operation-button
-              v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-edit')"
-              @click="handleEdit(record)" >修改</operation-button>
-            <operation-button
-              v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-del')"
-              :type="2"
-              title="是否要删除该条数据？"
-              @confirm="batchDelete(record.id)">删除</operation-button>
-            <!--<operation-button
-              v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-dispatch')"
-              @click="handleDispatching(record)" >派工</operation-button>-->
-          </template>
-        </span>
-        <span slot="status" slot-scope="text">
-          <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
-        </span>
-        <span slot="level" slot-scope="text">
-          <badge :text="BaseTool.Object.getField(levelMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[text]"/>
-        </span>
-      </s-table>
-    </div>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <detail ref="detailModal" @ok="handleOk"/>
-    <detail-out ref="detailOutModal" @ok="handleOk"/>
-    <dispatch-base-form ref="dispatchBaseForm" @ok="handleOk" />
-  </a-card>
+  <RepairForm :filter="0" :search-type="2"/>
 </template>
 
 <script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './modules/BaseForm'
-import Detail from './modules/DetailRepair'
-import DetailOut from './modules/DetailRepairOut'
-import { getRepairApplicationFormPage, deleteRepairApplicationForms, fetchRepairApplicationForm, exportRepairApplicationForm } from '@/api/repair/application-form'
-import DispatchBaseForm from '@/views/repair/application-form/modules/DispatchBaseForm'
-
+import RepairForm from './RepairForm'
 export default {
-  name: 'MyRepairApplicationFormList',
+  name: 'MyRepairForm',
   components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    Detail,
-    DetailOut,
-    DispatchBaseForm
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-        filter: 0,
-        searchType: 2
-      },
-      visible: true,
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          checked: true,
-          width: '70px',
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备编号',
-          checked: true,
-          width: '200px',
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '设备名称',
-          checked: true,
-          width: '200px',
-          dataIndex: 'sbId',
-          customRender: (text, record, index) => {
-            return record.sbName
-          }
-        },
-        {
-          title: '报修人',
-          checked: true,
-          width: '200px',
-          dataIndex: 'userName'
-        },
-        {
-          title: '报修来源',
-          checked: true,
-          width: '200px',
-          dataIndex: 'source',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.sourceMap, text)
-          }
-        },
-        {
-          title: '报修时间',
-          checked: true,
-          width: '200px',
-          dataIndex: 'applyTime'
-        },
-       /* {
-          title: '紧急等级',
-          checked: true,
-          dataIndex: 'level',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.levelMap, text)
-          }
-        },*/
-        {
-          title: '是否停机',
-          checked: true,
-          dataIndex: 'needStop',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.needStopMap, text)
-          }
-        },
-        {
-          title: '报修状态',
-          checked: true,
-          dataIndex: 'status',
-          width: '200px',
-          scopedSlots: { customRender: 'status' }
-        },
-
-        {
-          title: '创建日期',
-          width: '200px',
-          dataIndex: 'createdTime'
-        },
-        {
-          title: '操作',
-          checked: true,
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      sourceMap: {},
-      levelMap: {},
-      statusMap: {},
-      needStopMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam,
-          type: 1,
-          dataScope: {
-            sortBy: 'desc',
-            sortName: 'update_time'
-          }
-        }
-        return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    // 下拉框map
-    this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
-    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
-    this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-
-    this.tableOption()
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteRepairApplicationForms(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchRepairApplicationForm({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchRepairApplicationForm({ id: record.id }).then(res => {
-        this.visible = false
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.visible = true
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportRepairApplicationForm(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleDispatching (record) {
-      const modal = this.$refs.dispatchBaseForm
-      modal.base(record)
-    }
+    RepairForm
   }
 }
 </script>
+
+<style scoped>
+
+</style>

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

@@ -1,315 +1,17 @@
 <template>
-  <a-card :bordered="false">
-    <div v-show="visible">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="关键字">
-                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-
-      <div class="table-operator">
-        <a-button v-if="$auth('repair-application-forms-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-        <a-button style="margin-left: 8px" v-if="$auth('repair-application-forms-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-        <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('repair-application-forms-del')">
-          <a-menu slot="overlay">
-            <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
-              <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
-            </a-popconfirm>
-          </a-menu>
-          <a-button style="margin-left: 8px">
-            批量操作 <a-icon type="down" />
-          </a-button>
-        </a-dropdown>
-      </div>
-
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :alert="options.alert"
-        :rowSelection="options.rowSelection"
-        :scroll="{x: 1000, y: BaseTool.Constant.scrollY }"
-        showPagination="auto"
-      >
-        <span slot="action" slot-scope="record">
-          <template>
-            <a @click="handleView(record)">查看</a>
-
-            <operation-button
-              v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-edit')"
-              @click="handleEdit(record)" >修改</operation-button>
-            <operation-button
-              v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-del')"
-              :type="2"
-              title="是否要删除该条数据？"
-              @confirm="batchDelete(record.id)">删除</operation-button>
-            <!--<operation-button
-              v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-dispatch')"
-              @click="handleDispatching(record)" >派工</operation-button>-->
-          </template>
-        </span>
-        <span slot="status" slot-scope="text">
-          <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
-        </span>
-        <span slot="level" slot-scope="text">
-          <badge :text="BaseTool.Object.getField(levelMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[text]"/>
-        </span>
-      </s-table>
-    </div>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <detail ref="detailModal" @ok="handleOk"/>
-    <dispatch-base-form ref="dispatchBaseForm" @ok="handleOk" />
-  </a-card>
+  <RepairForm :filter="0" :search-type="1"/>
 </template>
 
 <script>
-import { STable, Ellipsis } from '@/components'
-import BaseForm from './modules/BaseForm'
-import Detail from './modules/Detail'
-import { getRepairApplicationFormPage, deleteRepairApplicationForms, fetchRepairApplicationForm, exportRepairApplicationForm } from '@/api/repair/application-form'
-import DispatchBaseForm from '@/views/repair/application-form/modules/DispatchBaseForm'
-
+import RepairForm from './RepairForm'
 export default {
-  name: 'RepairApplicationFormList',
+  name: 'RepairFormApply',
   components: {
-    STable,
-    Ellipsis,
-    BaseForm,
-    Detail,
-    DispatchBaseForm
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-        filter: 0,
-        searchType: 1
-      },
-      visible: true,
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'index',
-          checked: true,
-          customRender: (text, record, index) => {
-            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
-          }
-        },
-        {
-          title: '设备编号',
-          checked: true,
-          dataIndex: 'sbNo'
-        },
-        {
-          title: '设备名称',
-          checked: true,
-          dataIndex: 'sbId',
-          customRender: (text, record, index) => {
-            return record.sbName
-          }
-        },
-        {
-          title: '报修人',
-          checked: true,
-          dataIndex: 'actualUser'
-        },
-        {
-          title: '维修人',
-          checked: true,
-          dataIndex: 'repairUserName'
-        },
-        {
-          title: '报修来源',
-          checked: true,
-          dataIndex: 'source',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.sourceMap, text)
-          }
-        },
-        {
-          title: '报修时间',
-          checked: true,
-          dataIndex: 'applyTime'
-        },
-        {
-          title: '紧急等级',
-          checked: true,
-          dataIndex: 'level',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.levelMap, text)
-          }
-        },
-        {
-          title: '是否停机',
-          checked: true,
-          dataIndex: 'needStop',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.needStopMap,text)
-          }
-        },
-        {
-          title: '报修状态',
-          checked: true,
-          dataIndex: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
-
-        {
-          title: '创建日期',
-          dataIndex: 'createdTime'
-        },
-        {
-          title: '操作',
-          checked: true,
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 下拉框map
-      sourceMap: {},
-      levelMap: {},
-      statusMap: {},
-      needStopMap: {},
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        parameter = {
-          ...parameter,
-          ...this.queryParam,
-          type: 1,
-          dataScope: {
-            sortBy: 'desc',
-            sortName: 'update_time'
-          }
-        }
-        return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res.data
-          })
-      },
-      selectedRowKeys: [],
-      selectedRows: [],
-
-      options: {
-        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange
-        }
-      },
-      optionAlertShow: false
-    }
-  },
-  created () {
-    // 下拉框map
-    this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
-    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
-    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
-    this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-    // 获取浏览器的请求参数：报修单编号：no
-    const no = this.$route.query.no
-    if (no != null) {
-      this.queryParam.no = no
-    }
-    this.tableOption()
-  },
-  methods: {
-    tableOption () {
-      if (!this.optionAlertShow) {
-        this.options = {
-          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
-          rowSelection: {
-            selectedRowKeys: this.selectedRowKeys,
-            onChange: this.onSelectChange,
-            getCheckboxProps: record => ({
-              props: {
-                disabled: false,
-                name: record.id
-              }
-            })
-          }
-        }
-        this.optionAlertShow = true
-      } else {
-        this.options = {
-          alert: false,
-          rowSelection: null
-        }
-        this.optionAlertShow = false
-      }
-    },
-    batchDelete (id) {
-      let ids = []
-      if (this.BaseTool.String.isBlank(id)) {
-        const length = this.selectedRows.length
-        if (length === 0) {
-          this.$message.info('请选择要删除的记录')
-          return
-        }
-        ids = this.selectedRows.map(item => item.id)
-      } else {
-        ids = [id]
-      }
-      deleteRepairApplicationForms(ids).then(res => {
-        this.$message.info('删除成功')
-        this.handleOk()
-        this.$refs.table.clearSelected()
-      })
-    },
-    handleEdit (record) {
-      fetchRepairApplicationForm({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
-    },
-    handleView (record) {
-      fetchRepairApplicationForm({ id: record.id }).then(res => {
-        this.visible = false
-        const modal = this.$refs.detailModal
-        modal.base(res.data)
-      })
-    },
-    handleOk () {
-      this.visible = true
-      this.$refs.table.refresh()
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    resetSearchForm () {
-      this.queryParam = {
-      }
-      this.$refs.table.refresh(true)
-    },
-    doExport () {
-      const parameter = {
-        ...this.queryParam
-      }
-      exportRepairApplicationForm(parameter).then(file => {
-        this.BaseTool.UPLOAD.downLoadExportExcel(file)
-      })
-    },
-    handleDispatching (record) {
-      const modal = this.$refs.dispatchBaseForm
-      modal.base(record)
-    }
+    RepairForm
   }
 }
 </script>
+
+<style scoped>
+
+</style>

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

@@ -135,19 +135,27 @@ export default {
           dataIndex: 'applyTime'
         },
         {
-          title: '紧急等级',
+          title: '接收超时',
           checked: true,
-          dataIndex: 'level',
+          dataIndex: 'receiveOvertime',
           customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.levelMap, text)
+            if (text === '1') {
+              return '是'
+            } else {
+              return '否'
+            }
           }
         },
         {
-          title: '是否停机',
+          title: '维修超时',
           checked: true,
-          dataIndex: 'needStop',
+          dataIndex: 'repairOvertime',
           customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.needStopMap,text)
+            if (text === '1') {
+              return '是'
+            } else {
+              return '否'
+            }
           }
         },
         {
@@ -156,7 +164,6 @@ export default {
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' }
         },
-
         {
           title: '创建日期',
           dataIndex: 'createdTime'

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

@@ -4,9 +4,42 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
-                <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称"/>
+                <a-input v-model="queryParam.keyword" placeholder="请输入设备名称/设备新号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="设备旧号">
+                <a-input v-model="queryParam.zbh" placeholder="请输入设备旧号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="报修人">
+                <a-input v-model="queryParam.actualUser" placeholder="请输入报修人"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="问题描述">
+                <a-input v-model="queryParam.content" placeholder="问题描述模糊查询"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="起始日期">
+                <a-date-picker
+                  v-model="queryParam.searchStartTime"
+                  style="width: 100%"
+                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="结束日期">
+                <a-date-picker
+                  v-model="queryParam.searchEndTime"
+                  style="width: 100%"
+                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+                />
               </a-form-item>
             </a-col>
             <a-col :md="8 || 24" :sm="24">
@@ -92,7 +125,7 @@ import { getRepairApplicationFormPage, deleteRepairApplicationForms, fetchRepair
 import DispatchBaseForm from '@/views/repair/application-form/modules/DispatchBaseForm'
 
 export default {
-  name: 'RepairApplicationFormList',
+  name: 'RepairForm',
   components: {
     STable,
     Ellipsis,
@@ -103,12 +136,22 @@ export default {
     Detail,
     DispatchBaseForm
   },
+  props: {
+    filter: {
+      type: Number,
+      default: -1
+    },
+    searchType: {
+      type: Number,
+      default: null
+    }
+  },
   data () {
     return {
       // 查询参数
       queryParam: {
-        filter: -1,
-        searchType: 2
+        filter: this.filter,
+        searchType: this.searchType
       },
       visible: true,
       // 表头
@@ -125,13 +168,13 @@ export default {
         {
           title: '设备编号',
           checked: true,
-          width: '200px',
+          width: '100px',
           dataIndex: 'sbNo'
         },
         {
           title: '设备名称',
           checked: true,
-          width: '200px',
+          width: '150px',
           dataIndex: 'sbId',
           customRender: (text, record, index) => {
             return record.sbName
@@ -140,13 +183,13 @@ export default {
         {
           title: '报修人',
           checked: true,
-          width: '200px',
+          width: '120px',
           dataIndex: 'actualUser'
         },
         {
           title: '报修来源',
           checked: true,
-          width: '200px',
+          width: '100px',
           dataIndex: 'source',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.sourceMap, text)
@@ -155,7 +198,7 @@ export default {
         {
           title: '报修时间',
           checked: true,
-          width: '200px',
+          width: '150px',
           dataIndex: 'applyTime'
         },
         /* {
@@ -180,6 +223,32 @@ export default {
           width: '200px',
           dataIndex: 'createdTime'
         },
+        {
+          title: '接收超时',
+          checked: true,
+          width: '100px',
+          dataIndex: 'receiveOvertime',
+          customRender: (text, record, index) => {
+            if (text === '1') {
+              return '是'
+            } else {
+              return '否'
+            }
+          }
+        },
+        {
+          title: '维修超时',
+          checked: true,
+          width: '100px',
+          dataIndex: 'repairOvertime',
+          customRender: (text, record, index) => {
+            if (text === '1') {
+              return '是'
+            } else {
+              return '否'
+            }
+          }
+        },
         {
           title: '报修状态',
           checked: true,
@@ -310,6 +379,8 @@ export default {
     },
     handleOk () {
       this.visible = true
+      this.queryParam.searchStartTime = this.queryParam.searchStartTime ? this.BaseTool.Date.formatter(this.queryParam.searchStartTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
+      this.queryParam.searchEndTime = this.queryParam.searchEndTime ? this.BaseTool.Date.formatter(this.queryParam.searchEndTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
       this.$refs.table.refresh()
     },
     onSelectChange (selectedRowKeys, selectedRows) {
@@ -323,7 +394,9 @@ export default {
     },
     doExport () {
       const parameter = {
-        ...this.queryParam
+        ...this.queryParam,
+        searchStartTime: this.queryParam.searchStartTime,
+        searchEndTime: this.queryParam.searchEndTime
       }
       exportRepairApplicationForm(parameter).then(file => {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)

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

@@ -110,34 +110,34 @@
           </template>
         </span>
       </a-table>
-      <!--      <title-divider title="费用清单" width="90px" v-if="model.type == 2"></title-divider>-->
-      <!--      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status) && model.type === 2">-->
-      <!--        <a-button type="primary" @click="handleAddFee">-->
-      <!--          <a-icon type="plus"/>-->
-      <!--          添加-->
-      <!--        </a-button>-->
-      <!--      </div>-->
-      <!--      <a-table-->
-      <!--        v-if="model.type == 2"-->
-      <!--        :data-source="dataFee"-->
-      <!--        :columns="columnsFee"-->
-      <!--        tableLayout="auto"-->
-      <!--        rowKey="id">-->
-      <!--        <span slot="action" slot-scope="record">-->
-      <!--          <template>-->
-      <!--            <a @click="handleViewFee(record)">查看</a>-->
-      <!--            <operation-button-->
-      <!--              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"-->
-      <!--              @click="handleEditFee(record)" >修改</operation-button>-->
+      <title-divider title="费用清单" width="90px" v-if="model.type == 2"></title-divider>
+      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status) && model.type === 2">
+        <a-button type="primary" @click="handleAddFee">
+          <a-icon type="plus"/>
+          添加
+        </a-button>
+      </div>
+      <a-table
+        v-if="model.type == 2"
+        :data-source="dataFee"
+        :columns="columnsFee"
+        tableLayout="auto"
+        rowKey="id">
+        <span slot="action" slot-scope="record">
+          <template>
+            <a @click="handleViewFee(record)">查看</a>
+            <operation-button
+              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              @click="handleEditFee(record)" >修改</operation-button>
 
-      <!--            <operation-button-->
-      <!--              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"-->
-      <!--              :type="2"-->
-      <!--              title="确认删除该笔费用？"-->
-      <!--              @confirm="batchDeleteFee(record.id)" >删除</operation-button>-->
-      <!--          </template>-->
-      <!--        </span>-->
-      <!--      </a-table>-->
+            <operation-button
+              v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              :type="2"
+              title="确认删除该笔费用？"
+              @confirm="batchDeleteFee(record.id)" >删除</operation-button>
+          </template>
+        </span>
+      </a-table>
       <title-divider title="原因分析" width="90px"></title-divider>
       <div class="table-operator">
         <a-button type="primary" @click="handleAddReason">

src/views/sb/info/MeasureSbInfo.vue

@@ -113,7 +113,7 @@
             :data="loadData"
             :alert="options.alert"
             :rowSelection="options.rowSelection"
-            :scroll="{x: 1000 }"
+            :scroll="{x: 1500, y: BaseTool.Constant.scrollY}"
             showPagination="auto"
           >
             <span slot="action" slot-scope="record">

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

@@ -4,6 +4,7 @@
       <a-col :md="48" :sm="48">
         <span class="table-page-search-submitButtons" style="float: right">
           <a-button type="primary" @click="save()">提交</a-button>
+          <a-button style="margin-left: 8px" @click="handleFresh()">刷新位置</a-button>
           <a-button style="margin-left: 8px" @click="handleCancel()">返回</a-button>
         </span>
       </a-col>
@@ -879,7 +880,7 @@
 
 <script>
 import pick from 'lodash.pick'
-import { addSbInfo, updateSbInfo, copySbInfo } from '@/api/sb/info'
+import { addSbInfo, updateSbInfo, fetchSbInfo, copySbInfo } from '@/api/sb/info'
 import { fetchSbTypeTree } from '@/api/sb/type'
 import FirmProducerSelectModal from '@/views/firm/producer/modules/FirmProducerSelectModal'
 import SbGuigeSelectModal from '@/views/sb/guige/modules/SbGuigeSelectModal'
@@ -1198,6 +1199,18 @@ export default {
       this.form.resetFields()
       this.$emit('ok')
     },
+    handleFresh () {
+      fetchSbInfo({ id: this.id }).then(res => {
+        const { form: { setFieldsValue } } = this
+        const record = res.data
+        this.$nextTick(() => {
+          setFieldsValue(Object.assign(pick(record, [
+            'zjm',
+            'jbdh'
+          ])))
+        })
+      })
+    },
     setTree (record = {}) {
       fetchSbTypeTree().then(res => {
         this.sbTypeTreeData = res.data
@@ -1425,7 +1438,7 @@ export default {
       const zjm = getFieldValue('zjm')
       const jbdh = getFieldValue('jbdh')
       const a = document.createElement('a')
-      a.href = '/HITACHI-screen/point.html?id=' + this.id + '&zjm=' + zjm + '&jbdh=' + jbdh
+      a.href = '/hitch-screen/point.html?id=' + this.id + '&zjm=' + zjm + '&jbdh=' + jbdh
       a.target = '_blank'
       a.click()
     }

src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -58,6 +58,9 @@
               <a v-if="record.status === 1" @click="dealJumpDetail(record)">处理</a>
             </template>
           </span>
+          <a slot="name" slot-scope="text" v-html="text"> {{ text }}</a>
+          <span slot="content" slot-scope="text" v-html="text">
+          </span>
         </s-table>
       </div>
       <detail ref="detail" />
@@ -175,7 +178,8 @@ export default {
           title: '内容',
           dataIndex: 'content',
           align: 'center',
-          width: 400
+          width: 400,
+          scopedSlots: { customRender: 'content' }
         },
         {
           title: '时间',