zc

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

@@ -29,9 +29,10 @@
         </div>
         <!--审批单-->
         <div class="table-title-box-one" v-if="approvalPagePropsData.type == 2">
-          <img @click="allCheckClick" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!allCheckType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
-          <img @click="allCheckClick" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="allCheckType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
-          <p>全选</p>
+          <!--<img @click="allCheckClick" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!allCheckType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">-->
+          <!--<img @click="allCheckClick" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="allCheckType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">-->
+          <p></p>
+          <p></p>
           <p>化学品名</p>
           <p>化学品柜</p>
           <p>位置</p>
@@ -39,8 +40,8 @@
           <p>本次申购量</p>
         </div>
         <div class="table-list-box-one" v-if="approvalPagePropsData.type == 2" v-for="(item,index) in dataInfo.actHxpapplyDetailList" :key="index">
-          <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
-          <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
+          <img @click="checkClick(item)" v-if="item.tickStatus != 1" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
+          <img @click="checkClick(item)" v-if="item.tickStatus == 1" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
           <p></p>
           <el-tooltip class="item" effect="dark" :content="item.chemicalName" placement="top">
             <p>{{item.chemicalName}}</p>
@@ -109,6 +110,7 @@
               </div>
               <div class="right-max-box" style="border:none;">
               </div>
+              <p class="right-right-time-p">{{dataInfo.createTime}}</p>
             </div>
           </div>
           <div class="approval-for-box" v-if="dataInfo.approvalStatus!=3" v-for="(item,index) in dataInfo.configInfoList" :key="index">
@@ -159,6 +161,7 @@
                   </div>
                 </div>
               </div>
+              <p class="right-right-time-p">{{dataInfo.approvalStatus==2||dataInfo.approvalStatus==3?dataInfo.actApplytask.overTime:item.applyTaskTime}}</p>
             </div>
           </div>
           <div class="approval-for-box" v-if="dataInfo.approvalStatus==3">
@@ -175,6 +178,7 @@
               </div>
               <div class="right-max-box" style="border:none;">
               </div>
+              <p class="right-right-time-p">{{dataInfo.actApplytask.overTime}}</p>
             </div>
           </div>
           <p class="approval-for-min-p" v-if="dataInfo.approvalStatus==2">{{refuseContentText}}</p>
@@ -309,6 +313,7 @@
         for(let i=0;i<self.dataInfo.actHxpapplyDetailList.length;i++){
           if(self.dataInfo.actHxpapplyDetailList[i].checkType){
             let obj = {
+              cabinetId:self.dataInfo.actHxpapplyDetailList[i].cabinetId,
               chemicalId:self.dataInfo.actHxpapplyDetailList[i].chemicalId
             };
             list.push(obj);
@@ -818,7 +823,7 @@
           .cursor-img{
             cursor: pointer;
           }
-          img:nth-child(1){
+          p:nth-child(1){
             width:16px;
             height:16px;
             margin:17px 17px 0 29px;
@@ -1114,6 +1119,13 @@
               .right-max-end{
                 margin-bottom:0;
               }
+              .right-right-time-p{
+                font-size:14px;
+                color: #666666;
+                width:160px;
+                text-align: right;
+                padding-top:10px;
+              }
             }
           }
           .approval-for-min-p{

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

@@ -29,9 +29,10 @@
         </div>
         <!--审批单-->
         <div class="table-title-box-one" v-if="approvalPagePropsData.type == 2">
-          <img @click="allCheckClick" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!allCheckType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
-          <img @click="allCheckClick" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="allCheckType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
-          <p>全选</p>
+          <!--<img @click="allCheckClick" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!allCheckType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">-->
+          <!--<img @click="allCheckClick" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="allCheckType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">-->
+          <p></p>
+          <p></p>
           <p>化学品名</p>
           <p>化学品柜</p>
           <p>位置</p>
@@ -39,8 +40,8 @@
           <p>本次申购量</p>
         </div>
         <div class="table-list-box-one" v-if="approvalPagePropsData.type == 2" v-for="(item,index) in dataInfo.actHxpapplyDetailList" :key="index">
-          <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
-          <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
+          <img @click="checkClick(item)" v-if="item.tickStatus != 1" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
+          <img @click="checkClick(item)" v-if="item.tickStatus == 1" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
           <p></p>
           <el-tooltip class="item" effect="dark" :content="item.chemicalName" placement="top">
             <p>{{item.chemicalName}}</p>
@@ -73,6 +74,7 @@
               </div>
               <div class="right-max-box" style="border:none;">
               </div>
+              <p class="right-right-time-p">{{dataInfo.createTime}}</p>
             </div>
           </div>
           <div class="approval-for-box" v-if="dataInfo.approvalStatus!=3" v-for="(item,index) in dataInfo.configInfoList" :key="index">
@@ -123,6 +125,7 @@
                   </div>
                 </div>
               </div>
+              <p class="right-right-time-p">{{dataInfo.approvalStatus==2||dataInfo.approvalStatus==3?dataInfo.actApplytask.overTime:item.applyTaskTime}}</p>
             </div>
           </div>
           <div class="approval-for-box" v-if="dataInfo.approvalStatus==3">
@@ -139,6 +142,7 @@
               </div>
               <div class="right-max-box" style="border:none;">
               </div>
+              <p class="right-right-time-p">{{dataInfo.actApplytask.overTime}}</p>
             </div>
           </div>
           <p class="approval-for-min-p" v-if="dataInfo.approvalStatus==2">{{refuseContentText}}</p>
@@ -265,6 +269,7 @@
         for(let i=0;i<self.dataInfo.actHxpapplyDetailList.length;i++){
           if(self.dataInfo.actHxpapplyDetailList[i].checkType){
             let obj = {
+              cabinetId:self.dataInfo.actHxpapplyDetailList[i].cabinetId,
               chemicalId:self.dataInfo.actHxpapplyDetailList[i].chemicalId
             };
             list.push(obj);
@@ -668,6 +673,7 @@
     display: flex;
     flex-direction: column;
     overflow: hidden;
+    font-weight: 500;
     p{
       margin:0;
       padding:0;
@@ -775,7 +781,7 @@
           .cursor-img{
             cursor: pointer;
           }
-          img:nth-child(1){
+          p:nth-child(1){
             width:16px;
             height:16px;
             margin:17px 17px 0 29px;
@@ -1071,6 +1077,13 @@
               .right-max-end{
                 margin-bottom:0;
               }
+              .right-right-time-p{
+                font-size:14px;
+                color: #666666;
+                width:160px;
+                text-align: right;
+                padding-top:10px;
+              }
             }
           }
           .approval-for-min-p{