zc

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -54,7 +54,7 @@
                 <span :style="'color:'+scope.row.fiedColor+';'">{{scope.row.levelName}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="危化品危险指标" align="left" prop="riskIndicator" width="130" show-overflow-tooltip/>
+            <el-table-column label="重大危险源辨识指标" align="left" prop="riskIndicator" width="150" show-overflow-tooltip/>
             <el-table-column label="学院" align="left" prop="deptName" width="150" show-overflow-tooltip/>
             <el-table-column label="责任人" align="left" prop="adminName" width="106" show-overflow-tooltip/>
             <el-table-column label="安全责任人" align="left" prop="adminName" width="200" show-overflow-tooltip/>

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/listPage.vue

@@ -326,6 +326,17 @@
         let self = this;
         this.$refs["dialogForm"].validate(valid => {
           if (valid) {
+            for(let i=0;i<self.dialogData.maxList.length;i++){
+              let maxNum = parseFloat(self.dialogData.maxList[i].maxNum);
+              let num = 0;
+              for(let o=0;o<self.dialogData.maxList[i].list.length;o++){
+                num = num + parseFloat(self.dialogData.maxList[i].list[o].chemicalAmount)
+              }
+              if(num>maxNum){
+                this.msgError(self.dialogData.maxList[i].name+' 总容器容量大于可存放量');
+                return
+              }
+            }
             let obj = {
               subId:this.dialogData.subId,
               chemicalId:this.listPropsData.id,

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

@@ -5,7 +5,7 @@
         <p>化学品申购</p>
         <p class="reset-button-one button-p" @click="backPage">返回</p>
         <!--已拒绝/已撤销时显示-->
-        <p class="inquire-button-one button-p" v-if="dataInfo.approvalStatus==2||dataInfo.approvalStatus==3" @click="goEditPage">编辑</p>
+        <p class="inquire-button-one button-p" v-if="(dataInfo.approvalStatus==2||dataInfo.approvalStatus==3)&&approvalPagePropsData.myDataType==1" @click="goEditPage">编辑</p>
       </div>
       <div class="page-max-box scrollbar-box">
         <div class="text-box-one">
@@ -462,6 +462,17 @@
                 }
               }
             }
+            let type = true;
+            let configInfoList = [];
+            for(let i=0;i<response.data.configInfoList.length;i++){
+              if(type){
+                configInfoList.push(response.data.configInfoList[i]);
+              }
+              if(response.data.configInfoList[i].applyTaskStatus == 2){
+                type = false;
+              }
+            }
+            this.$set(response.data,'configInfoList',configInfoList);
             this.$set(this,'dataInfo',response.data);
             this.$set(this,'pageType',1);
           });
@@ -569,6 +580,17 @@
                 }
               }
             }
+            let type = true;
+            let configInfoList = [];
+            for(let i=0;i<response.data.configInfoList.length;i++){
+              if(type){
+                configInfoList.push(response.data.configInfoList[i]);
+              }
+              if(response.data.configInfoList[i].applyTaskStatus == 2){
+                type = false;
+              }
+            }
+            this.$set(response.data,'configInfoList',configInfoList);
             this.$set(this,'dataInfo',response.data);
             this.$set(this,'pageType',1);
           });

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

@@ -272,7 +272,8 @@
           let obj = {
             id:row.id,
             type:1,
-            userType:row.userType
+            userType:row.userType,
+            myDataType:row.myDataType
           };
           this.$set(this,'approvalPagePropsData',obj);
           this.pageType = 4;
@@ -281,7 +282,8 @@
           let obj = {
             id:row.id,
             type:2,
-            userType:row.userType
+            userType:row.userType,
+            myDataType:row.myDataType
           };
           this.$set(this,'approvalPagePropsData',obj);
           this.pageType = 4;

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

@@ -334,6 +334,17 @@
         let self = this;
         this.$refs["dialogForm"].validate(valid => {
           if (valid) {
+            for(let i=0;i<self.dialogData.maxList.length;i++){
+              let maxNum = parseFloat(self.dialogData.maxList[i].maxNum);
+              let num = 0;
+              for(let o=0;o<self.dialogData.maxList[i].list.length;o++){
+                num = num + parseFloat(self.dialogData.maxList[i].list[o].chemicalAmount)
+              }
+              if(num>maxNum){
+                this.msgError(self.dialogData.maxList[i].name+' 总容器容量大于可存放量');
+                return
+              }
+            }
             let obj = {
               subId:this.dialogData.subId,
               chemicalId:this.selectioned.id,

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

@@ -418,6 +418,17 @@
                 }
               }
             }
+            let type = true;
+            let configInfoList = [];
+            for(let i=0;i<response.data.configInfoList.length;i++){
+              if(type){
+                configInfoList.push(response.data.configInfoList[i]);
+              }
+              if(response.data.configInfoList[i].applyTaskStatus == 2){
+                type = false;
+              }
+            }
+            this.$set(response.data,'configInfoList',configInfoList);
             this.$set(this,'dataInfo',response.data);
             this.$set(this,'pageType',1);
           });
@@ -525,6 +536,17 @@
                 }
               }
             }
+            let type = true;
+            let configInfoList = [];
+            for(let i=0;i<response.data.configInfoList.length;i++){
+              if(type){
+                configInfoList.push(response.data.configInfoList[i]);
+              }
+              if(response.data.configInfoList[i].applyTaskStatus == 2){
+                type = false;
+              }
+            }
+            this.$set(response.data,'configInfoList',configInfoList);
             this.$set(this,'dataInfo',response.data);
             this.$set(this,'pageType',1);
           });