pdf查看修改

src/dashoo.cn/frontend_web/src/pages/lims/createreport/docviewframe.vue

@@ -49,11 +49,12 @@
     methods: {
       // 返回
       backFunc(){
-        let _this = this
-        _this.$router.push({
-          path: '/lims/createreport/reporttodo',
-          query: ''
-        })
+        this.$router.go(-1)
+        // let _this = this
+        // _this.$router.push({
+        //   path: '/lims/createreport',
+        //   query: ''
+        // })
       },
     }
 

src/dashoo.cn/frontend_web/src/pages/lims/createreport/reporttodo.vue

@@ -47,7 +47,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby"
         @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" :span-method="objectSpanMethod">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-        <el-table-column label="操作" width="180" align="center" fixed>
+        <el-table-column label="操作" width="230" align="center" fixed>
           <template slot-scope="scope">
             <!-- <router-link :to="'/lims/tasksentrust/'+scope.row.EId+'/operation'">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
@@ -97,12 +97,12 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="ReportCode" sortable min-width="120" label="报告编号" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="TestDetail" sortable min-width="120" label="报告名称" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="EntrustNo" sortable min-width="120" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ReportCode" sortable min-width="110" label="报告编号" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="TestDetail" sortable min-width="110" label="报告名称" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="EntrustNo" sortable min-width="110" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="CustomerName" sortable min-width="120" label="委托方名称" align="center"
           show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ReportStatus" sortable label="报告状态" align="center" min-width="120">
+        <el-table-column prop="ReportStatus" sortable label="报告状态" align="center" min-width="110">
           <template slot-scope="scope">
             <el-alert v-if="scope.row.ReportStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="审核通过" type="success">
@@ -131,12 +131,12 @@
           </template>
         </el-table-column> -->
         <el-table-column prop="SignUserBy" sortable label="签发人" min-width="100" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="SignUserOn" sortable min-width="120" label="签发时间" align="center" show-overflow-tooltip>
+        <el-table-column prop="SignUserOn" sortable min-width="110" label="签发时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.SignUserOn+'') }}
           </template>
         </el-table-column>
-        <el-table-column prop="CreateOn" sortable min-width="120" label="生成时间" align="center" show-overflow-tooltip>
+        <el-table-column prop="CreateOn" sortable min-width="110" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.CreateOn+'') }}
           </template>

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/alltask.vue

@@ -126,14 +126,14 @@
             </el-button> -->
           </template>
         </el-table-column>
-        <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"
+        <el-table-column prop="EntrustNo" sortable min-width="110" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DataEntryCode" sortable min-width="110" label="录入编码" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="CustomerName" sortable min-width="120" label="委托方名称" align="center"
           show-overflow-tooltip></el-table-column>
-        <el-table-column prop="TestDetail" sortable min-width="100" label="检测明细项" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="TestDetail" sortable min-width="120" label="检测明细项" align="center" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="Department" sortable min-width="85" label="负责部门" align="center" show-overflow-tooltip></el-table-column> -->
-        <el-table-column prop="CreateBy" sortable min-width="85" label="负责人" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="BalanceTime" sortable min-width="100" label="检测时间" align="center" show-overflow-tooltip>
+        <el-table-column prop="CreateBy" sortable min-width="90" label="负责人" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="BalanceTime" sortable min-width="110" label="检测时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.BalanceTime+'') }}
           </template>
@@ -477,7 +477,6 @@
         row,
         rowIndex
       }) {
-        console.log("-------wwwww",row)
         if (row.Recheck === 1) {
           return 'warning-row';
         }

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/docviewframe.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 查看数据录入pdf
         </span>
         <span style="float: right;">
-          <el-button plain size="mini" title="返回" click="window.history.go(-1)">返回</el-button>
+          <el-button plain size="mini" title="返回" @click="backFunc">返回</el-button>
         </span>
       </div>
       <div style="overflow: hidden">
@@ -51,6 +51,16 @@
 
     },
     methods: {
+      // 返回
+      backFunc(){
+        this.$router.go(-1)
+        // window.history.go(-1)
+        // let _this = this
+        // _this.$router.push({
+        //   path: '/lims/dataentry/tacktodo',
+        //   query: ''
+        // })
+      },
     }
 
   }

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

@@ -126,12 +126,12 @@
             </el-button> -->
           </template>
         </el-table-column>
-        <el-table-column prop="EntrustNo" sortable min-width="130" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center"
+        <el-table-column prop="EntrustNo" sortable min-width="110" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DataEntryCode" sortable min-width="110" label="录入编码" align="center"
           show-overflow-tooltip></el-table-column>
         <el-table-column prop="CustomerName" sortable min-width="120" label="委托方名称" align="center"
           show-overflow-tooltip></el-table-column>
-        <el-table-column prop="TestDetail" sortable min-width="120" label="检测项目" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="TestDetail" sortable min-width="110" label="检测项目" align="center" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="Department" sortable min-width="85" label="负责部门" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="CreateBy" sortable min-width="90" label="负责人" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="BalanceTime" sortable min-width="110" label="检测时间" align="center" show-overflow-tooltip>

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/tacktodo.vue

@@ -96,14 +96,14 @@
             </el-popover>-->
           </template>
         </el-table-column>
-        <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center"
+        <el-table-column prop="EntrustNo" sortable min-width="110" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DataEntryCode" sortable min-width="110" label="录入编码" align="center"
           show-overflow-tooltip></el-table-column>
-        <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"
+        <el-table-column prop="CustomerName" sortable min-width="120" label="委托方名称" align="center"
           show-overflow-tooltip></el-table-column>
-        <el-table-column prop="TestDetail" sortable min-width="100" label="检测明细项" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="CreateBy" sortable min-width="85" label="负责人" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="BalanceTime" sortable min-width="100" label="检测时间" align="center" show-overflow-tooltip>
+        <el-table-column prop="TestDetail" sortable min-width="120" label="检测明细项" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="CreateBy" sortable min-width="90" label="负责人" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="BalanceTime" sortable min-width="110" label="检测时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.BalanceTime+'') }}
           </template>