修改样式

src/components/Materialman/InventoryChange.vue

@@ -87,14 +87,22 @@
         :total="total">
       </el-pagination>
     </div>
+    <el-dialog title="物料详情" top="0" :visible.sync="CheckDetailState" width="1150px">
+      <wlDetails ref="mychild"></wlDetails>
+    </el-dialog>
+
 
   </div>
 </template>
 
 <script>
+  import wlDetails from "@/components/global/wlDetails.vue";
 
   export default {
     name: 'InventoryChange',
+    components: {
+      wlDetails
+    },
     data(){
       return{
         CheckDetailState:false,
@@ -131,7 +139,8 @@
           SupplierName:''
         },
         wulaioList:[],
-
+        PropertyId:'',
+        CheckDetailState:false,
 
       }
     },
@@ -167,6 +176,13 @@
           null
         );
       },
+      getCheckDes(item){
+        this.PropertyId=item.SuppliesId;
+        this.CheckDetailState=true;
+        setTimeout(()=>{
+          this.$refs.mychild.InitData(this.PropertyId);
+        },10)
+      },
       currentChange(val) {
         this.msg.pageIndex = val;
         this.getList();

src/components/Materialman/rukuDetails.vue

@@ -29,6 +29,7 @@
             <el-col :span="12">
               <span>仓库名称 :</span>
               <span>{{GetDetail.WareHouseName}}</span>
+              <span v-if="prohibit==true && compType=='shenpi'" style="color: #FF4048">(此仓库正在盘点)</span>
             </el-col>
             <el-col :span="12">
               <span>金额:</span>
@@ -454,6 +455,8 @@
         endDate:'',
         PropertyId:'',
         CheckDetailState:false,
+        WarehouseList:[],
+        prohibit:false,
       }
     },
     created(){
@@ -467,8 +470,8 @@
         this.addMsg.Id=this.$route.query.Id;
         this.danjuMsg.ResourceId=this.$route.query.Id;
       }
-      this.getDetail();
       this.getdanjuList();
+      this.getSuppliesCheckList();
 
 
     },
@@ -481,6 +484,21 @@
     },
 
     methods:{
+      getSuppliesCheckList(){//获取盘点中的仓库
+        this.apiJavaPost("/api/WarehouseOut/GetSuppliesCheckList",{},
+          res => {
+            if (res.data.resultCode === 1) {
+              this.WarehouseList = res.data.data && res.data.data.length>0 ?  res.data.data:[]
+
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+        this.getDetail();//获取盘点仓库了再获取详情
+
+      },
       inited (viewer){
         this.$viewer = viewer
       },
@@ -696,6 +714,10 @@
         );
       },
       approvalOrder(num){
+        if(this.prohibit==true){
+          this.Error("仓库正在盘点，不能审核/驳回！");
+          return;
+        }
         if(this.GetDetail.Is_AuditSelf==1){
           this.Error("制单人跟审核人不能相同哟，请转交!");
           return;
@@ -782,6 +804,14 @@
                 this.endDate = newTime.replace("前","");
               }
               let list = [];
+              if(this.WarehouseList.length>0){//盘点详情的仓库是否在盘点中
+                this.WarehouseList.forEach(x=>{
+                  if(x.WarehouseId == data.WarehouseId){
+                    this.prohibit = true
+                  }
+                })
+              }
+
               for ( let i = 0; i < this.GetDetail.AuditSteps.length ; i++ ){
                 list.push(this.GetDetail.AuditSteps[i]);
                 if(this.GetDetail.AuditSteps[i].Status==4){

src/components/Materialman/rukuExamine.vue

@@ -90,10 +90,10 @@
                 <div>{{item.WareHouseName}}</div>
                 <div>{{item.SupplierName}}</div>
               </td>
-              <td>{{delist.SuppliesNum}}</td>
+              <td @click="getCheckDes(delist)" style="text-decoration: underline;cursor: pointer;">{{delist.SuppliesNum}}</td>
               <td style="width:300px">{{delist.SuppliesName}}</td>
               <td>
-                <p v-for="(x,y) in delist.GoodsSpecificationList" :key="y">{{x}}{{y+1==delist.GoodsSpecificationList.length?'':'，'}}</p>
+                <span v-for="(x,y) in delist.GoodsSpecificationList" :key="y">{{x}}{{y+1==delist.GoodsSpecificationList.length?'':'，'}}</span>
               </td>
               <td>{{delist.CategoryName}}</td>
               <td>{{delist.BrandName}}</td>
@@ -164,15 +164,22 @@
         </div>
       </el-form>
     </el-dialog>
+    <el-dialog title="物料详情" top="0" :visible.sync="CheckDetailState" width="1150px">
+      <wlDetails ref="mychild"></wlDetails>
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import wlDetails from "@/components/global/wlDetails.vue";
 
   export default {
         name: "rukuExamine",
+        components: {
+          wlDetails
+        },
         data(){
           return{
             showTable:1,
@@ -206,6 +213,9 @@
               Description:'',
             },
             dialogState:false,
+            PropertyId:'',
+            CheckDetailState:false,
+
           }
         },
       mounted(){
@@ -229,6 +239,13 @@
           this.getYishenpi();
         }
       },
+      getCheckDes(item){
+        this.PropertyId=item.SuppliesId;
+        this.CheckDetailState=true;
+        setTimeout(()=>{
+          this.$refs.mychild.InitData(this.PropertyId);
+        },10)
+      },
       getDaishenpi(){
         this.loading=true;
         this.apiJavaPost("/api/Supplies/GetStockInWaitMyAuditPageList",this.msg,