zc

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

@@ -69,7 +69,7 @@
                   </el-form-item>
                 </div>
                 <p class="form-list-text-p">
-                  {{minItem.applyText?minItem.applyText:'请选择化学品柜'}}
+                  {{minItem.applyText?minItem.applyText+'g':'请选择化学品柜'}}
                 </p>
                 <div class="form-list-two-box">
                   <el-form-item label="" :prop="'maxList.'+ index +'.list.'+ minIndex +'.applyNum'"
@@ -222,7 +222,8 @@
                     chemicalId: self.formData.maxList[i].chemicalId,
                     chemicalName: self.formData.maxList[i].chemicalName,
                     cabinetId: self.formData.maxList[i].list[o].cabinetId,
-                    applyNum: self.formData.maxList[i].list[o].applyNum
+                    applyNum: self.formData.maxList[i].list[o].applyNum,
+                    remainingStorage:self.formData.maxList[i].list[o].applyText
                   }
                   upObj.actHxpapplyDetailList.push(obj)
                 }

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

@@ -52,7 +52,7 @@
           <el-tooltip class="item" effect="dark" :content="item.posi" placement="top">
             <p>{{item.posi}}</p>
           </el-tooltip>
-          <p>{{item.remainingStorage}}</p>
+          <p>{{item.remainingStorage}}g</p>
           <p>{{item.applyNum}}</p>
         </div>
         <!--审批-->
@@ -86,7 +86,7 @@
           <p>{{item.collegeInventory}}</p>
           <p>{{item.subInventory}}</p>
           <p>{{item.cabinetStorage}}</p>
-          <p>{{item.remainingStorage}}</p>
+          <p>{{item.remainingStorage}}g</p>
           <p>{{item.applyNum}}</p>
           <p @click="pageToggle(2,item)">化学品</p>
           <p @click="getHxpChemicalInfo(item.chemicalId)">化学品详情</p>
@@ -320,7 +320,8 @@
             let obj = {
               // cabinetId:self.dataInfo.actHxpapplyDetailList[i].cabinetId,
               // chemicalId:self.dataInfo.actHxpapplyDetailList[i].chemicalId,
-              id:self.dataInfo.actHxpapplyDetailList[i].id
+              id:self.dataInfo.actHxpapplyDetailList[i].id,
+              remainingStorage:self.dataInfo.actHxpapplyDetailList[i].remainingStorage
             };
             list.push(obj);
           }

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

@@ -70,7 +70,7 @@
                     </el-form-item>
                   </div>
                   <p class="form-list-text-p">
-                    {{minItem.applyText?minItem.applyText:'请选择化学品柜'}}
+                    {{minItem.applyText?minItem.applyText+'g':'请选择化学品柜'}}
                   </p>
                   <div class="form-list-two-box">
                     <el-form-item label="" :prop="'maxList.'+ index +'.list.'+ minIndex +'.applyNum'"
@@ -248,7 +248,8 @@
                     chemicalId: self.formData.maxList[i].chemicalId,
                     chemicalName: self.formData.maxList[i].chemicalName,
                     cabinetId: self.formData.maxList[i].list[o].cabinetId,
-                    applyNum: self.formData.maxList[i].list[o].applyNum
+                    applyNum: self.formData.maxList[i].list[o].applyNum,
+                    remainingStorage:self.formData.maxList[i].list[o].applyText
                   }
                   upObj.actHxpapplyDetailList.push(obj)
                 }

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

@@ -69,7 +69,7 @@
                   </el-form-item>
                 </div>
                 <p class="form-list-text-p">
-                  {{minItem.applyText?minItem.applyText:'请选择化学品柜'}}
+                  {{minItem.applyText?minItem.applyText+'g':'请选择化学品柜'}}
                 </p>
                 <div class="form-list-two-box">
                   <el-form-item label="" :prop="'maxList.'+ index +'.list.'+ minIndex +'.applyNum'"
@@ -223,7 +223,8 @@
                     chemicalId: self.formData.maxList[i].chemicalId,
                     chemicalName: self.formData.maxList[i].chemicalName,
                     cabinetId: self.formData.maxList[i].list[o].cabinetId,
-                    applyNum: self.formData.maxList[i].list[o].applyNum
+                    applyNum: self.formData.maxList[i].list[o].applyNum,
+                    remainingStorage:self.formData.maxList[i].list[o].applyText
                   }
                   upObj.actHxpapplyDetailList.push(obj)
                 }

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

@@ -52,7 +52,7 @@
           <el-tooltip class="item" effect="dark" :content="item.posi" placement="top">
             <p>{{item.posi}}</p>
           </el-tooltip>
-          <p>{{item.remainingStorage}}</p>
+          <p>{{item.remainingStorage}}g</p>
           <p>{{item.applyNum}}</p>
         </div>
         <p class="approval-title-p">审批流程</p>
@@ -272,7 +272,8 @@
             let obj = {
               // cabinetId:self.dataInfo.actHxpapplyDetailList[i].cabinetId,
               // chemicalId:self.dataInfo.actHxpapplyDetailList[i].chemicalId,
-              id:self.dataInfo.actHxpapplyDetailList[i].id
+              id:self.dataInfo.actHxpapplyDetailList[i].id,
+              remainingStorage:self.dataInfo.actHxpapplyDetailList[i].remainingStorage
             };
             list.push(obj);
           }

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

@@ -70,7 +70,7 @@
                     </el-form-item>
                   </div>
                   <p class="form-list-text-p">
-                    {{minItem.applyText?minItem.applyText:'请选择化学品柜'}}
+                    {{minItem.applyText?minItem.applyText+'g':'请选择化学品柜'}}
                   </p>
                   <div class="form-list-two-box">
                     <el-form-item label="" :prop="'maxList.'+ index +'.list.'+ minIndex +'.applyNum'"
@@ -249,7 +249,8 @@
                     chemicalId: self.formData.maxList[i].chemicalId,
                     chemicalName: self.formData.maxList[i].chemicalName,
                     cabinetId: self.formData.maxList[i].list[o].cabinetId,
-                    applyNum: self.formData.maxList[i].list[o].applyNum
+                    applyNum: self.formData.maxList[i].list[o].applyNum,
+                    remainingStorage:self.formData.maxList[i].list[o].applyText
                   }
                   upObj.actHxpapplyDetailList.push(obj)
                 }