zc

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/addPage.vue

@@ -251,7 +251,7 @@
           };
           this.$parent.goPage(3,obj);
         }else if(type == 3){
-          this.$parent.backPage();
+          this.$parent.backPage(1);
         }
       },
       // 机柜选中

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/index.vue

@@ -87,7 +87,16 @@
         <el-table-column label="申购编号" align="center" prop="applyNum" width="150"/>
         <el-table-column label="申购人" align="center" prop="subscriber" width="110"/>
         <el-table-column label="实验室" align="center" prop="subName" width="160" show-overflow-tooltip/>
-        <el-table-column label="申购信息" align="center" prop="chemicalNames" show-overflow-tooltip/>
+        <el-table-column label="申购信息" align="center" prop="chemicalNames">
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" placement="top">
+              <div v-html="(scope.row.chemicalNames).replace(/;/g, '<br />')" slot="content"></div>
+              <div class="oneLine" style="display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
+                {{scope.row.chemicalNames}}
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column label="申请时间" align="center" prop="createTime" width="170"/>
         <el-table-column label="完成时间" align="center" prop="overTime" width="170"/>
         <el-table-column label="状态" align="center" prop="approvalContent" width="100"/>

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/listPage.vue

@@ -47,7 +47,7 @@
         <el-form-item style="float: right;">
           <el-col :span="1.5">
             <p class="reset-button-one"
-               @click="backPage"
+               @click="backPage(0)"
             >返回</p>
           </el-col>
         </el-form-item>
@@ -187,8 +187,12 @@
         this.handleQuery();
       },
       //返回
-      backPage(){
-        this.$parent.pageToggle(0);
+      backPage(type){
+        if(type == 0){
+          this.$parent.pageToggle(0);
+        }else if(type == 1){
+          this.$parent.pageToggle(1);
+        }
       },
       // 多选框选中数据
       handleSelectionChange(selection) {

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/index.vue

@@ -68,13 +68,22 @@
           </el-form-item>
         </el-form>
         <el-table v-loading="loading" border :data="tableList">
-          <el-table-column label="申购编号" align="center" prop="applyNum"  show-overflow-tooltip/>
-          <el-table-column label="实验室" align="center" prop="subName"  show-overflow-tooltip/>
-          <el-table-column label="申购信息" align="center" prop="chemicalNames"  show-overflow-tooltip/>
-          <el-table-column label="申请时间" align="center" prop="createTime"  show-overflow-tooltip/>
-          <el-table-column label="完成时间" align="center" prop="overTime"  show-overflow-tooltip/>
-          <el-table-column label="状态" align="center" prop="approvalContent"  width="160px"/>
-          <el-table-column label="审批人" align="center" prop="status" width="100px">
+          <el-table-column label="申购编号" align="center" prop="applyNum" width="150" show-overflow-tooltip/>
+          <el-table-column label="实验室" align="center" prop="subName" width="200" show-overflow-tooltip/>
+          <el-table-column label="申购信息" align="center" prop="chemicalNames">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" placement="top">
+                <div v-html="(scope.row.chemicalNames).replace(/;/g, '<br />')" slot="content"></div>
+                <div class="oneLine" style="display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
+                  {{scope.row.chemicalNames}}
+                </div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column label="申请时间" align="center" prop="createTime" width="170" show-overflow-tooltip/>
+          <el-table-column label="完成时间" align="center" prop="overTime" width="170" show-overflow-tooltip/>
+          <el-table-column label="状态" align="center" prop="approvalContent"  width="100px"/>
+          <el-table-column label="审批人" align="center" prop="status" width="200px">
             <template slot-scope="scope">
               <div>
                 <el-tooltip class="item" effect="dark" :content="scope.row.dqName?'当前：'+scope.row.dqName:'当前：无'" placement="top">