盘点仓库的判断

src/components/CommodityMan/goodsListEdit.vue

@@ -50,6 +50,10 @@
                     <el-input v-model="addMsg.Name" size="small" placeholder="请输入内容" maxlength="100" show-word-limit>
                     </el-input>
                   </el-form-item>
+                  <el-form-item label="商品副标题" >
+                    <el-input v-model="addMsg.SubName" size="small" placeholder="请输入内容" maxlength="100" show-word-limit>
+                    </el-input>
+                  </el-form-item>
                   <el-form-item label="供应商" prop="SupplierId">
                     <el-select class="w150" style="margin-right: 10px;" v-model="SupplierId" size="small"
                       placeholder="请选择" @change='changeSupplier'>
@@ -1082,6 +1086,7 @@
           PresentFXGrade:0,
           PresentFXMonth:0,
           Advertising:'',
+          SubName:'',
         },
         SupplierId: '',
         fenleiData: [],

src/components/empower/procurementMange.vue

@@ -717,6 +717,7 @@
       putstorage(row){
           this.CommonJump('putinStorage', {
           ID: row.Id,
+          WareHouseId:row.WareHouseId,
         });
       },
       goprint(row){

src/components/empower/putinStorage.vue

@@ -26,6 +26,15 @@
 .putinStorage .el-button--small {
   padding: 9px 25px;
 }
+.putinStorage .box_tip{
+  width: 100%;
+  margin: 10px 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color:#F56C6C;
+  font-size: 26px;
+}
 </style>
 <template>
   <div class="putinStorage">
@@ -34,6 +43,9 @@
         style="margin:0 9px;color:#C0C4CC">/</span><span>入库</span>
     </div>
     <div class="mimitBody">
+        <div class='box_tip' v-if="ISoperation == true">
+          <span>此仓库正在盘点中,暂不支持任何操作！</span>
+        </div>
         <div>
             <span>仓库名称：{{Detaildata.WareHouseName}}</span>
             <span style="margin-left:30px">备注：{{Detaildata.Remark}}</span>
@@ -73,7 +85,7 @@
       </el-table>
     </div>
     
-    <el-button size="small" type="primary" @click="submitForm()" >入库</el-button
+    <el-button size="small" type="primary" @click="submitForm()" :disabled = 'ISoperation' >入库</el-button
     >
   </div>
 </template>
@@ -81,15 +93,16 @@
 export default {
   data() {
     return {
-        Detaildata:{}
-   
+        Detaildata:{},
+        WareHouseId:0,
+        ISoperation:false
     };
   },
   created() {},
   methods: {
       
     getProcurementInfo(data) {
-        console.log(data)
+       
         this.assetsApipost("/api/property/GetProcurementInfo", {ProcurementId:data.ID}, res => {
           if (res.data.resultCode == 1) {
               let data = res.data.data
@@ -103,6 +116,22 @@ export default {
         })
   
     },
+    getSuppliesCheckList(WareHouseId){
+       this.assetsApipost("/api/Property/GetSuppliesCheckList", {}, res => {
+          if (res.data.resultCode == 1) {
+             let data = res.data.data
+             if(data.length>0){
+                data.forEach(x=>{
+                  if(x.WarehouseId == WareHouseId){
+                    this.ISoperation = true //如果有在盘点的仓库
+                  }
+                })
+             }
+          } else {
+            this.Error(res.data.message);
+          }
+        })
+    },
     submitForm(){
         let msg = {
              Id:0,
@@ -153,9 +182,10 @@ export default {
     
   },
   mounted() {
+     this.WareHouseId = this.$route.query.WareHouseId;
+    this.getSuppliesCheckList(this.$route.query.WareHouseId)
     this.getProcurementInfo(this.$route.query)
-    
-    
+   
   }
 };
 </script>

src/components/orderMan/orderList.vue

@@ -53,6 +53,14 @@
             </el-option>
           </el-select>
         </el-input>
+      
+      </div>
+      <div>
+          <span >主播名称：</span>
+          <el-input @clear="msg.pageIndex=1,getList()"  @keyup.enter.native="msg.pageIndex=1,getList()" clearable style="margin-top:10px;width:200px" class="input-with-select"
+            placeholder="请输入主播名称" v-model="msg.AnchorName" size="small">
+          
+          </el-input>
       </div>
       <div>
         <el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick">
@@ -592,6 +600,7 @@
           Mobile: '',
           ProductCode: '',
           Recycled: 2,
+          AnchorName:'',
         },
         platList: [],
         option: [{