Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/role/admin.vue

@@ -187,7 +187,7 @@
           @click="toSendInformaton">发送短信验证码</el-button>  -->
        
           
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -200,7 +200,7 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toCheckPDFInformation">PDF验证</el-button>
+          @click="toCheckPDFInformation">PDF验证</el-button> -->
      </div>
     
       

src/xt_pages/stock/drugs/inventory.vue

@@ -331,11 +331,11 @@ export default {
                    list[i].last_stock_min_number = ""
                    list[i].min_number = list[i].XtBaseDrug.min_number
                    list[i].manufacturer_name  = ""
-                   if(this.org_id == 10489){
-                     list[i].type = 4
-                   }else{
-                     list[i].type = 6
-                    }
+                  //  if(this.org_id == 10489){
+                  //    list[i].type = 4
+                  //  }else{
+                  //    list[i].type = 6
+                  //   }
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){
                         list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

src/xt_pages/stock/inventory.vue

@@ -456,11 +456,11 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            for(let i=0;i<list.length;i++){
-              if(this.org_id == 10489){
-                list[i].type = 4
-              }else{
-                list[i].type = 6
-              }
+              // if(this.org_id == 10489){
+              //   list[i].type = 4
+              // }else{
+              //   list[i].type = 6
+              // }
               
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name