二级库-仓库管理

src/api/warehouse.js

@@ -131,3 +131,11 @@ export function updatedrugout(params) {
     params: params
   })
 }
+//获取管理员列表()
+export function getusername(params) {
+  return request({
+    url: '/api/secondary/getusername',
+    method: 'get',
+    params: params
+  })
+}

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

@@ -24,16 +24,20 @@
           <el-input type="textarea" v-model="ruleForm.address"></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-group>
         </el-form-item>
-        <el-form-item label="仓库管理员" ><!--prop="region">-->
-          admin
-<!--          <el-select v-model="ruleForm.region" placeholder="请选择管理员">-->
-<!--            <el-option label="admin" value="0"></el-option>-->
-<!--          </el-select>-->
+        <el-form-item label="仓库管理员" prop="storehouse_admin_name" >
+          <el-select v-model="ruleForm.region" @change="changeadmin">
+            <el-option
+              v-for="item in adminnamelist"
+              :key="item.id"
+              :label="item.user_name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
     </div>
@@ -45,7 +49,7 @@
 </template>
 
 <script>
-import { getcode,addstorehouse,updatestorehouse } from "@/api/warehouse";
+import { getcode,addstorehouse,updatestorehouse,getusername } from "@/api/warehouse";
 import login from '../../../../mock/login'
 export default {
   data() {
@@ -55,10 +59,11 @@ export default {
       storehouse_code:"coco",
       dialogVisible: false,
       labelPosition:'left',
+      adminnamelist: [],
       ruleForm: {
-        admin_name:"",
+        admin_name:"",//管理员名字
+        admin_id:"",//管理员id
         storehouse_name: "",
-        region: "",
         date1: "",
         date2: "",
         delivery: false,
@@ -90,12 +95,27 @@ export default {
     };
   },
   methods: {
+    changeadmin() {
+      console.log("rrrrrrrrrrrrrrrrrrr")
+    },
+    usernamelist(){
+      //获取管理员列表
+      getusername().then((res) => {
+        if (res.data.state == 1){
+          this.adminnamelist = res.data.data.list;
+        }
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+    },
     show(data, type) {
       if (type == 1) {
         this.initstorehouseData();
         this.show_type = 1;
         this.title = "新增仓库";
         this.dialogVisible = true;
+        this.usernamelist()
       } else if (type == 2) {
         console.log("data:::::::::::",data);
         this.show_type = 2;
@@ -108,6 +128,7 @@ export default {
         this.ruleForm.admin_name = data.storehouse_admin_name;
         console.log("this.ruleForm.admin_name",this.ruleForm.admin_name);
         this.dialogVisible = true;
+        this.usernamelist()
       }
     },
     // 获取仓库编码接口
@@ -132,6 +153,7 @@ export default {
       this.ruleForm.address = "";
     },
 
+    //修改仓库状态
 
     //  验证表单内容
     submitForm(ruleForm) {
@@ -143,12 +165,10 @@ export default {
               storehouse_code: this.storehouse_code || "",
               storehouse_name: this.ruleForm.storehouse_name || "",
               storehouse_address: this.ruleForm.address || "",
-              storehouse_status:parseInt(this.ruleForm.status)
-              // storehouse_admin_id: this.ruleForm.storehouse_admin_id || "",
-              // storehouse_admin_name: this.ruleForm.storehouse_admin_name || "",
+              storehouse_status:parseInt(this.ruleForm.status),
+              storehouse_admin_id: this.ruleForm.admin_id || "",
+              storehouse_admin_name: this.ruleForm.admin_name || "",
             };
-            console.log("params::::",params)
-            console.log("status::::",this.ruleForm.status)
             addstorehouse(params).then((res) => {
               if (res.data.state == 1) {
                 this.$message.success("新增成功");
@@ -174,9 +194,9 @@ export default {
               storehouse_name: this.ruleForm.storehouse_name || "",
               storehouse_address: this.ruleForm.address || "",
               storehouse_status:parseInt(this.ruleForm.status),
-              id: this.storehouse_id
-              // storehouse_admin_id: this.ruleForm.storehouse_admin_id || "",
-              // storehouse_admin_name: this.ruleForm.storehouse_admin_name || "",
+              id: this.storehouse_id,
+              storehouse_admin_id: this.ruleForm.admin_id || "",
+              storehouse_admin_name: this.ruleForm.admin_name || "",
             };
             updatestorehouse(params).then((res) => {
               if (res.data.state == 1) {

src/xt_pages/stock/warehouseManage/query.vue

@@ -136,13 +136,11 @@ export default {
   name: "stockIn",
   created() {
     var types = getDictionaryDataConfig("system", "drug_type");
-    console.log("44444", types);
     var arr = [];
     var obj = { id: 0, name: "全部" };
     arr.push(obj);
     arr.push(...types);
     this.drugType = arr;
-    console.log("arrr", arr);
     this.getlist();
   },
   components: {
@@ -235,7 +233,6 @@ export default {
     },
     // 编辑仓库
     toEdit(data,val) {
-      console.log("data is :",data)
       this.$refs.AddWareHouse.show(data,val);
     },
     // 禁用仓库