设备台账

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -1,131 +1,67 @@
 <template>
   <no-ssr placeholder="数据拼命读取中，请稍候。。。">
-    <div style="width: 100%; overflow-y: auto" v-loading="downloading">
-      <div slot="header" style="padding-top: 0px">
-        <el-card>
-        <!--<span style="float: left; margin-top:10px;">-->
-          <!--<img v-if="user.photo" :src="'http://'+user.host+user.photo" class="avatar-index">-->
-          <!--<img v-else class="avatar-index" src="../assets/img/avatar-default.jpg" :alt="user.name"> &nbsp;[-->
-          <!--{{user.Realname}} ]-->
-        <!--</span>-->
-          <span style="float: right; margin-right:10px;">
-          <!--<el-form ref="form" :inline="true" style="float: right;">-->
-            <!--<el-form-item label="查询日期">-->
-              <!--<el-date-picker v-model="Getime" size="mini" type="daterange" range-separator="至" start-placeholder="开始日期"-->
-                              <!--end-placeholder="结束日期" style="width:200px" @change="getNewData"></el-date-picker>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item>-->
-              <!--<el-select v-if="allshow" v-model="Department" clearable filterable placeholder="请选择公司" size="mini" style="width: 110px"-->
-                         <!--@change="getNewData">-->
-                <!--<el-option v-for="item in departmentList" :key="item.value" :label="item.Name" :value="item.Id"></el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-form>-->
-        </span>
-          <!--<el-form ref="form" :inline="true" style="float: left; margin-left:20px;">-->
-            <!--<el-form-item>-->
-              <!--<router-link :to="'/lims/dataentry/tacktodo'">-->
-                <!--<el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.entry]">-->
-                  <!--数据录入-->
-                  <!--<span style="color:#0000FF">【{{usertotal.EntryTotal}}】</span>-->
-                <!--</el-button>-->
-              <!--</router-link>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item>-->
-              <!--<router-link :to="'/lims/dataentry/tacktodo'">-->
-                <!--<el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.check]">-->
-                  <!--数据校核-->
-                  <!--<span style="color:#0000FF">【{{usertotal.CheckTotal}}】</span>-->
-                <!--</el-button>-->
-              <!--</router-link>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item>-->
-              <!--<router-link :to="'/lims/dataentry/tacktodo'">-->
-                <!--<el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!tjz && !allshow && permissions[permissionscode.audit]">-->
-                  <!--数据预审-->
-                  <!--<span style="color:#0000FF">【{{usertotal.AuditTotal}}】</span>-->
-                <!--</el-button>-->
-              <!--</router-link>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item>-->
-              <!--<router-link :to="'/lims/dataentry/tacktodo'">-->
-                <!--<el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.audit]">-->
-                  <!--数据审批-->
-                  <!--<span style="color:#0000FF">【{{usertotal.AuditTotal}}】</span>-->
-                <!--</el-button>-->
-              <!--</router-link>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item>-->
-              <!--<router-link :to="'/lims/createreport/reporttodo'">-->
-                <!--<el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.sign]">-->
-                  <!--报告签发-->
-                  <!--<span style="color:#0000FF">【{{usertotal.SignTotal}}】</span>-->
-                <!--</el-button>-->
-              <!--</router-link>-->
-            <!--</el-form-item>-->
-          <!--</el-form>-->
-        </el-card>
+  <div v-loading="downloading">
+    <div slot="header" style="padding-top: 0px">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane label="待办任务" name="first">
+          <el-table :data="WaitData" size="mini" border :stripe="true" style="width: 100%">
+            <el-table-column label="待办工作跳转" width="100" align="center" fixed>
+              <template slot-scope="scope">
+                <el-button type="primary" plain size="mini" @click="gopage(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center"></el-table-column>
+            <el-table-column prop="CustomerName" sortable min-width="90" label="委托方名称" align="center"></el-table-column>
+            <el-table-column prop="TestDetail" sortable min-width="100" label="检测项目" align="center"></el-table-column>
+            <el-table-column prop="CheckStatus" sortable min-width="90" label="待办工作" align="center">
+              <template slot-scope="scope">
+                <el-tag size="small" v-show="scope.row.CheckStatus=='0'" type="danger">数据录入</el-tag>
+                <el-tag size="small" v-show="scope.row.CheckStatus=='1'" type="success">数据校核</el-tag>
+                <el-tag size="small" v-show="scope.row.CheckStatus=='2'" type="info">数据审批</el-tag>
+                <el-tag size="small" v-show="scope.row.CheckStatus=='4'" type="info">数据审批</el-tag>
+                <el-tag size="small" v-show="scope.row.CheckStatus=='20'" type="warning">报告审核</el-tag>
+                <el-tag size="small" v-show="scope.row.CheckStatus=='30'" type="warning">报告签发</el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="handleSizeChange"
+                         @current-change="handleCurrentChange"
+                         :current-page="currentPage"
+                         :page-sizes="[10, 15, 20, 25]"
+                         :page-size="size"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="currentItemCount">
+          </el-pagination>
+        </el-tab-pane>
+        <el-tab-pane label="已办任务" name="second">
+          <el-table :data="DoneData" size="mini" border :stripe="true" style="width: 100%">
+            <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center"></el-table-column>
+            <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"></el-table-column>
+            <el-table-column prop="TestDetail" sortable min-width="100" label="检测项目" align="center"></el-table-column>
+            <el-table-column prop="CheckStatus" sortable min-width="100" label="已办工作" align="center">
+              <template slot-scope="scope">
+                <el-tag size="small" v-show="scope.row.CreateUserId == user.id&&scope.row.CheckStatus=='1'" type="danger">数据录入</el-tag>
+                <el-tag size="small" v-show="scope.row.JHUserId == user.id&&(scope.row.CheckStatus=='2'||scope.row.CheckStatus=='3')"
+                        type="success">数据校核</el-tag>
+                <el-tag size="small" v-show="scope.row.CheckUserId == user.id&&(scope.row.CheckStatus=='4'||scope.row.CheckStatus=='5')"
+                        type="info">数据审批</el-tag>
+                <el-tag size="small" v-show="scope.row.ReportStatus != '0'" type="warning">报告签发</el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="handleSizeChangeFinished"
+                         @current-change="handleCurrentChangeFinished"
+                         :current-page="currentPageFinished"
+                         :page-sizes="[10, 15, 20, 25]"
+                         :page-size="sizeFinished"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="currentItemCountFinished">
+          </el-pagination>
+        </el-tab-pane>
+      </el-tabs>
 
-        <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-          <el-tab-pane label="待办任务" name="first">
-            <el-table :data="WaitData" size="mini" border :stripe="true" style="width: 100%">
-              <el-table-column label="待办工作跳转" width="100" align="center" fixed>
-                <template slot-scope="scope">
-                  <el-button type="primary" plain size="mini" @click="gopage(scope.row)">详情</el-button>
-                </template>
-              </el-table-column>
-              <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center"></el-table-column>
-              <el-table-column prop="CustomerName" sortable min-width="90" label="委托方名称" align="center"></el-table-column>
-              <el-table-column prop="TestDetail" sortable min-width="100" label="检测项目" align="center"></el-table-column>
-              <el-table-column prop="CheckStatus" sortable min-width="90" label="待办工作" align="center">
-                <template slot-scope="scope">
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='0'" type="danger">数据录入</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='1'" type="success">数据校核</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='2'" type="info">数据审批</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='4'" type="info">数据审批</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='20'" type="warning">报告审核</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='30'" type="warning">报告签发</el-tag>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-pagination @size-change="handleSizeChange"
-                           @current-change="handleCurrentChange"
-                           :current-page="currentPage"
-                           :page-sizes="[10, 15, 20, 25]"
-                           :page-size="size"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="currentItemCount">
-            </el-pagination>
-          </el-tab-pane>
-          <el-tab-pane label="已办任务" name="second">
-            <el-table :data="DoneData" size="mini" border :stripe="true" style="width: 100%">
-              <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center"></el-table-column>
-              <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"></el-table-column>
-              <el-table-column prop="TestDetail" sortable min-width="100" label="检测项目" align="center"></el-table-column>
-              <el-table-column prop="CheckStatus" sortable min-width="100" label="已办工作" align="center">
-                <template slot-scope="scope">
-                  <el-tag size="small" v-show="scope.row.CreateUserId == user.id&&scope.row.CheckStatus=='1'" type="danger">数据录入</el-tag>
-                  <el-tag size="small" v-show="scope.row.JHUserId == user.id&&(scope.row.CheckStatus=='2'||scope.row.CheckStatus=='3')"
-                          type="success">数据校核</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckUserId == user.id&&(scope.row.CheckStatus=='4'||scope.row.CheckStatus=='5')"
-                          type="info">数据审批</el-tag>
-                  <el-tag size="small" v-show="scope.row.ReportStatus != '0'" type="warning">报告签发</el-tag>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-pagination @size-change="handleSizeChangeFinished"
-                           @current-change="handleCurrentChangeFinished"
-                           :current-page="currentPageFinished"
-                           :page-sizes="[10, 15, 20, 25]"
-                           :page-size="sizeFinished"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="currentItemCountFinished">
-            </el-pagination>
-          </el-tab-pane>
-        </el-tabs>
-
-      </div>
     </div>
+  </div>
   </no-ssr>
 </template>
 

src/dashoo.cn/frontend_web/src/pages/lims/checkequipmentlist/index.vue

@@ -4,21 +4,21 @@
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/lims/s5ovelimscheckequipmentlist' }">二级单位设备台账表</el-breadcrumb-item>
     </el-breadcrumb>-->
-    <el-row :gutter="20">
+    <el-row :gutter="5">
       <el-col :span="6">
         <el-tree style="height: calc(100vh - 243px); overflow: auto;" draggable highlight-current :expand-on-click-node="true" node-key="id" :data="customerTreeList" :props="orgtreeprops"
-                  @node-click="orgtreeNodeClick" ref="orgmanagetree">
+                 @node-click="orgtreeNodeClick" ref="orgmanagetree">
         </el-tree>
       </el-col>
       <el-col :span="18">
-        <el-card class="box-card" style="height: calc(100vh - 90px);">
+        <el-card class="box-card">
           <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 设备台账
-        </span>
+            <span>
+              <i class="icon icon-table2"></i>
+            </span>
             <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="NewEntity">添加</el-button>
-        </span>
+              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="NewEntity">添加</el-button>
+            </span>
             <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
               <el-form-item label="生成时间">
                 <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
@@ -42,7 +42,9 @@
               </el-form-item>
             </el-form>
           </div>
-          <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" :row-class-name="tableRowClassName" size="mini">
+          <el-alert title="提示： 已过期为【红色】, 当月到期为【黄色】" type="warning" :closable="false">
+          </el-alert>
+          <el-table :data="entityList" border style="width: 100%" @sort-change="orderby" :row-class-name="tableRowClassName" size="mini">
             <el-table-column label="操作" width="160px" align="center" fixed>
               <template slot-scope="scope">
                 <el-button type="primary" title="编辑" size="small" plain @click="ShowEntityDialog(scope.row.Id)">编辑</el-button>
@@ -167,11 +169,11 @@
         </el-form-item>
         <el-form-item label="检测周期" :label-width="formLabelWidth">
           <el-input v-model="formData.Cycle" class="input-with-select" @change="CheckCycleDate">
-          <el-select v-model="formData.CycleUnit" slot="append" placeholder="请选择" style="width: 85px">
-            <el-option label="年" value="年"></el-option>
-            <el-option label="月" value="月"></el-option>
-            <el-option label="天" value="天"></el-option>
-          </el-select>
+            <el-select v-model="formData.CycleUnit" slot="append" placeholder="请选择" style="width: 85px">
+              <el-option label="年" value="年"></el-option>
+              <el-option label="月" value="月"></el-option>
+              <el-option label="天" value="天"></el-option>
+            </el-select>
           </el-input>
         </el-form-item>
         <el-form-item label="备注" :label-width="formLabelWidth">