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

src/xt_pages/stock/warehouseManage/components/AddWareHouse.vue

           <el-input type="textarea" v-model="ruleForm.address" @input="aa"></el-input>
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="ruleForm.status" >
+          <el-radio-group v-model="ruleForm.status"  >
             <el-radio :label="1" >启用</el-radio>
-            <el-radio :label="0" >禁用</el-radio>
+            <el-radio :label="0">禁用</el-radio>
+<!--            <el-radio :label="1" @click.native="toDisable2">启用</el-radio>-->
+<!--            <el-radio :label="0" @click.native="toDisable">禁用</el-radio>-->
           </el-radio-group>
         </el-form-item>
         <el-form-item label="仓库管理员" prop="admin_id" >
 </template>
 
 <script>
-import { getcode,addstorehouse,updatestorehouse,getusername } from "@/api/warehouse";
+import { getcode,addstorehouse,updatestorehouse,getusername,updatestatus } from "@/api/warehouse";
 import login from '../../../../mock/login'
 export default {
   data() {
       console.log('op')
     },
     changeadmin(item) {
-      console.log("aaaaabbaaaaa",this.ruleForm.admin_id)
     },
     handleSelect() {
 
         this.dialogVisible = true;
         this.usernamelist()
       } else if (type == 2) {
-        console.log("data:::::::::::",data);
         this.show_type = 2;
-        this.storehouse_id = data.id;
+        this.storehouse_id = data.ID;
         this.title = "编辑仓库";
-        this.storehouse_code = data.storehouse_code;
-        this.ruleForm.address = data.storehouse_address;
-        this.ruleForm.status = data.storehouse_status;
-        this.ruleForm.storehouse_name = data.storehouse_name;
-        this.ruleForm.admin_name = data.storehouse_admin_name;
-        this.ruleForm.admin_id = data.storehouse_admin_id;
+        this.storehouse_code = data.StorehouseCode;
+        this.ruleForm.address = data.StorehouseAddress;
+        this.ruleForm.status = data.StorehouseStatus;
+        this.ruleForm.storehouse_name = data.StorehouseName;
+        this.ruleForm.admin_name = data.StorehouseAdminName;
+        this.ruleForm.admin_id = data.StorehouseAdminId;
         this.dialogVisible = true;
         this.usernamelist()
       }
     },
     //清除表单数据
     closePop() {
-      console.log("this.ruleForm",this.ruleForm)
+      // console.log("this.ruleForm",this.ruleForm)
       this.dialogVisible = false;
       this.ruleForm.admin_name = "";
       this.ruleForm.admin_id = "";
       this.ruleForm.address = "";
     },
 
-    //修改仓库状态
-
     //  验证表单内容
     submitForm(ruleForm) {
       if (this.show_type == 1) {
         this.$refs[ruleForm].validate((valid) => {
           if (valid) {
-            console.log("this.ruleForm.status",this.ruleForm.status);
             let params = {
               storehouse_code: this.storehouse_code || "",
               storehouse_name: this.ruleForm.storehouse_name || "",
       } else if (this.show_type == 2) {
         this.$refs[ruleForm].validate((valid) => {
           if (valid) {
-            console.log("this.ruleForm.status",this.ruleForm.status);
             let params = {
               storehouse_code: this.storehouse_code || "",
               storehouse_name: this.ruleForm.storehouse_name || "",

src/xt_pages/stock/warehouseManage/query.vue

       >
         <el-table-column label="仓库编号" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.storehouse_code ? scope.row.storehouse_code : "" }}</span>
+            <span>{{ scope.row.StorehouseCode ? scope.row.StorehouseCode : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.storehouse_name ? scope.row.storehouse_name : "" }}</span>
+            <span>{{ scope.row.StorehouseName ? scope.row.StorehouseName : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库地址" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.storehouse_address ? scope.row.storehouse_address : "" }}</span>
+            <span>{{ scope.row.StorehouseAddress ? scope.row.StorehouseAddress : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库管理员" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.storehouse_admin_name ? scope.row.storehouse_admin_name : "" }}</span>
+            <span>{{ scope.row.StorehouseAdminName ? scope.row.StorehouseAdminName : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="状态" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.storehouse_status == 1">启用</span>
-            <span v-if="scope.row.storehouse_status == 0">禁用</span>
+            <span v-if="scope.row.StorehouseStatus == 1">启用</span>
+            <span v-if="scope.row.StorehouseStatus == 0">禁用</span>
           </template>
         </el-table-column>
 
         page: this.page,
         limit: this.limit,
       };
-      console.log("params", params);
       //请求分页接口
       storehouselist(params).then((response) => {
         if (response.data.state == 1) {
     // 编辑仓库
     toEdit(data,val) {
       this.$nextTick(() => {
-        console.log("aaaaaaaaa",data)
-        console.log("bbbbbbbbbb",val)
         this.$refs.AddWareHouse.show(data, val);
       })
     },
     // 禁用仓库
     toDisable(val, index) {
       var params = {
-        id:val.id,
+        id:val.ID,
       };
       this.$confirm("是否确定将此仓库禁用?", "禁用仓库信息", {
         confirmButtonText: "确 定",
     //删除仓库
     toDelete(val, index) {
       var params = {
-        id:val.id,
+        id:val.ID,
       };
       this.$confirm("是否确定将此仓库删除?", "删除仓库信息", {
         confirmButtonText: "确 定",

src/xt_pages/stock/warehouseManage/waresetting.vue

           <div style="line-height: 36px; white-space: nowrap">
             请选择耗材自动入库仓库：
           </div>
-          <el-select v-model="h1" placeholder="请选择" @select="handleSelect1" @change="updateconfig1(h1)" >
+          <el-select v-model="h1" filterable placeholder="请选择" @select="handleSelect1" @change="updateconfig1(h1)" >
             <el-option
               v-for="item in options"
               :key="item.storehouse_name"
           <div style="line-height: 36px; white-space: nowrap">
             请选择耗材自动出库仓库：
           </div>
-          <el-select v-model="h2" placeholder="请选择" @select="handleSelect2" @change="updateconfig2(h2)">
+          <el-select v-model="h2" filterable placeholder="请选择" @select="handleSelect2" @change="updateconfig2(h2)">
             <el-option
               v-for="item in options"
               :key="item.storehouse_name"
           <div style="line-height: 36px; white-space: nowrap">
             请选择药品自动入库仓库：
           </div>
-          <el-select v-model="h3" placeholder="请选择" @select="handleSelect3" @change="updateconfig3(h3)">
+          <el-select v-model="h3" filterable placeholder="请选择" @select="handleSelect3" @change="updateconfig3(h3)">
             <el-option
               v-for="item in options"
               :key="item.storehouse_name"
           <div style="line-height: 36px; white-space: nowrap">
             请选择药品自动出库仓库：
           </div>
-          <el-select v-model="h4" placeholder="请选择" @select="handleSelect4" @change="updateconfig4(h4)">
+          <el-select v-model="h4" filterable placeholder="请选择" @select="handleSelect4" @change="updateconfig4(h4)">
             <el-option
               v-for="item in options"
               :key="item.storehouse_name"
       let param ={}
       findstorehouseconfig(param).then((response) => {
         if (response.data.state == 1) {
-          console.log("response",response)
           this.h1 = response.data.data.storehouse_info;
           this.h2 = response.data.data.storehouse_out_info;
           this.h3 = response.data.data.drug_storehouse_info;