lichao 3 месяцев назад
Родитель
Сommit
5f35eebf29

+ 24 - 15
src/views/resourceManager/components/goodsMangement/goodsMangementruku.vue

@@ -142,7 +142,7 @@
           :loading="tableExportLoading"
           @click="doExport"
           >导出</el-button>
-      </div> 
+      </div>
     </div>
     <!-- 物品入库表表格 -->
     <div class="common-table-div" >
@@ -409,7 +409,7 @@ export default {
           this.getDataList3();
           break
         case 4 :
-          this.getDataList4(this.stuffNo); 
+          this.getDataList4(this.stuffNo);
           break
         case 5 :
           this.getDataList5(this.stuffNo);
@@ -497,7 +497,7 @@ export default {
     //     }
     //     this.page.pageNum = 1;
     //     this.axios.get('pass/baseManagement/v1/limslrcstuffs/queryLimsLrcStuffPage' + '?pageNum=' + this.page.pageNum +
-    //       '&pageSize=' + this.page.pageSize + '&stuffTypeName=' + this.search.stuffTypeName  + '&stuffName=' + this.search.stuffName + 
+    //       '&pageSize=' + this.page.pageSize + '&stuffTypeName=' + this.search.stuffTypeName  + '&stuffName=' + this.search.stuffName +
     //       '&startTime=' + startTime + '&endTime=' + endTime + '&optEvent=' + '1')
     //     .then(res => {
     //       this.dataLoading = false;
@@ -523,8 +523,8 @@ export default {
         //   this.dataLoading3 = false;
         //   return 0
         // } else {
-        this.axios.get('pass/baseManagement/v1/limslrcstuffis/selectRuku' + '?pageNum=' + this.page3.pageNum + '&pageSize=' + this.page3.pageSize 
-                      + '&stuffTypeName=' + this.search.stuffTypeName  + '&stuffName=' + this.search.stuffName 
+        this.axios.get('pass/baseManagement/v1/limslrcstuffis/selectRuku' + '?pageNum=' + this.page3.pageNum + '&pageSize=' + this.page3.pageSize
+                      + '&stuffTypeName=' + this.search.stuffTypeName  + '&stuffName=' + this.search.stuffName
                       + '&startTime=' + startTime +'&endTime=' + endTime)
               .then(res => {
                 this.dataLoading3 = false;
@@ -644,11 +644,20 @@ export default {
         return;
       }
       let tt = false;
-      this.multipleSelection5.forEach(s=>{
-        if(s.state == '1'){
+      let userVilidate = false;
+      this.multipleSelection5.forEach(s => {
+        if (s.state == '1') {
           tt = true;
         }
+        if(userName === s.createMan) {
+          userVilidate = true;
+        }
       })
+      if(userVilidate) {
+        this.$message.warning('存在数据的创建人与当前用户一致,请重新勾选!')
+        return;
+      }
+
       if(tt){
         this.$message.warning('请勾选未验收的数据!')
         return;
@@ -1459,8 +1468,8 @@ export default {
         startTime = this.search.times[0]
         endTime = this.search.times[1]
       }
-      this.axios.get('pass/baseManagement/v1/limslrcstuffis/selectRuku' + '?pageNum=' + this.page3.pageNum + '&pageSize=' + this.page3.pageSize 
-                      + '&stuffTypeName=' + this.search.stuffTypeName  + '&stuffName=' + this.search.stuffName 
+      this.axios.get('pass/baseManagement/v1/limslrcstuffis/selectRuku' + '?pageNum=' + this.page3.pageNum + '&pageSize=' + this.page3.pageSize
+                      + '&stuffTypeName=' + this.search.stuffTypeName  + '&stuffName=' + this.search.stuffName
                       + '&startTime=' + startTime +'&endTime=' + endTime)
             .then(res => {
               this.dataLoading3 = false;
@@ -1486,8 +1495,8 @@ export default {
         this.dataLoading4 = false;
         return 0
       } else {
-      this.axios.get('pass/baseManagement/v1/limslrcstuffos/' + '?pageNum=' + this.page4.pageNum + '&pageSize=' + this.page4.pageSize 
-                      + '&stuffTypeName=' + this.search.stuffTypeName  + '&stuffName=' + this.search.stuffName 
+      this.axios.get('pass/baseManagement/v1/limslrcstuffos/' + '?pageNum=' + this.page4.pageNum + '&pageSize=' + this.page4.pageSize
+                      + '&stuffTypeName=' + this.search.stuffTypeName  + '&stuffName=' + this.search.stuffName
                       + '&stuffNo=' + stuffNo +'&startTime=' + startTime +'&endTime=' + endTime)
             .then(res => {
               this.dataLoading4 = false;
@@ -1511,25 +1520,25 @@ export default {
             let validState;
             for(let i = 0; i < this.multipleSelection5.length; i++){
                 if(this.multipleSelection5[i].validFlag == '0'){
-                  this.multipleSelection5[i].validFlag = '已停用' 
+                  this.multipleSelection5[i].validFlag = '已停用'
                   this.multipleSelection5[i].state = ''
                 }
                 if(this.multipleSelection5[i].validFlag == '1'){
-                  this.multipleSelection5[i].validFlag = '已启用' 
+                  this.multipleSelection5[i].validFlag = '已启用'
                   if(this.multipleSelection5[i].state == '0'){
                     this.multipleSelection5[i].state = '未验收'
                   }
                   if(this.multipleSelection5[i].state == '1'){
                     this.multipleSelection5[i].state = '已验收'
                   }
-                }    
+                }
             }
             this.tableExportLoading = true;
             let tHeader = [];
             let filterVal = [];
             tHeader = ['数据状态','验收状态', '入库记录号', '库房名称', '物品编码', '物品批号', '物品名称', '规格说明', '物品类别', '计量单位', '入库类型', '入库数量', '入库申请人', '入库经办人', '入库时间', '有效期至', '存放位置', '证书数量', '供应商', '库存记录号', '备注', '创建人', '创建时间', '更新人', '更新时间']
             filterVal = ['validFlag','state', 'inId', 'strNo', 'stuffNo', 'stuffNoUser', 'stuffName', 'stuffSpec', 'stuffTypeName', 'stuffUnit', 'instkType', 'qtyInstk', 'instkApp', 'instkHnd', 'instkTime', 'endDate', 'strLoc', 'certNum', 'merchName', 'stkId', 'memo', 'createMan', 'createTime', 'updateMan', 'updateTime']
-            
+
             exportToExcel(this.multipleSelection5, tHeader, filterVal, '物品入库信息', [], [], [])
             // setTimeout(() => {
             //     setTimeout(() => {