二级库-仓库管理bug修改,还有hisbug346

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -257,13 +257,13 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期">
                 </el-date-picker> -->
-                <el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                <el-date-picker type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
                                 placeholder="选择时间" v-model="start_time" style="width:200px"
                                 @change="changeStart"
                 >
                 </el-date-picker>
                 -
-                <el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                <el-date-picker type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
                                 placeholder="选择时间" v-model="end_time" style="width:200px"
                                 @change="changeEnd"
                 >
@@ -488,8 +488,8 @@
           { value: 4, label: '免收诊金' },
           { value: 5, label: '专家' }
         ],
-        start_time: moment().format('YYYY-MM-DD'),
-        end_time: moment().format('YYYY-MM-DD'),
+        start_time: moment().format('YYYY-MM-DD HH:mm'),
+        end_time: moment().format('YYYY-MM-DD HH:mm'),
         limit: 10,
         page: 1,
         total: 0,

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

@@ -222,9 +222,10 @@ export default {
                 this.$emit("init");
               } else {
                 this.$message.error("保存失败：" + res.data.msg);
-                setTimeout(() => {
-                  this.closePop();
-                }, 2000);
+                // setTimeout(() => {
+                //   this.closePop();
+                // }, 2000);
+                this.dialogVisible = true
               }
             });
           } else {

src/xt_pages/stock/warehouseManage/query.vue

@@ -89,7 +89,7 @@
                 v-if="scope.row.StorehouseStatus == 0"
                 size="small"
                 type="primary"
-                @click="toDisable(scope.row, scope.row.$index)"
+                @click="toDisable2(scope.row, scope.row.$index)"
                 ><img
                   src="../../../assets/purchase/set.png"
                   alt=""
@@ -188,9 +188,11 @@ export default {
       };
       //请求分页接口
       storehouselist(params).then((response) => {
+        console.log("fenyeeeeeeeeeeeeeeeeeee")
         if (response.data.state == 1) {
           this.tableData = response.data.data.list;
           this.total = response.data.data.total;
+          console.log("this.tableData",this.tableData)
         }
       });
     },
@@ -279,6 +281,32 @@ export default {
         })
         }).catch(() => {});
     },
+    // 启用仓库
+    toDisable2(val, index) {
+      var params = {
+        id:val.ID,
+      };
+      this.$confirm("是否确定将此仓库启用?", "启用仓库信息", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+        updatestatus(params).then((res) => {
+          if (res.data.state == 1) {
+            this.$message.success(res.data.data.list);
+            this.Disable_= 1
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })//刷新
+          .then(() =>{
+            this.initData();
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+      }).catch(() => {});
+    },
     //删除仓库
     toDelete(val, index) {
       var params = {