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

src/lang/en.js

@@ -95,6 +95,8 @@ export default {
     deviceZoneManage: 'Device Zone Manage',
     deviceGroupManage: 'Device Group Manage',
     stockManage: 'Stock Manage',
+    wareHouseManage:'Ware House Manage',
+    inventoryTransfer:'inventoryTransfer',
     supplyManage: 'Supply Manage',
     supplyQuery: 'supply query',
     baseInfo: 'base Info',

src/lang/zh.js

@@ -1,4 +1,5 @@
 export default {
+// 须在src/lang中进行国际化配置
   route: {
     dashboard: '首页',
     introduction: '简述',
@@ -172,6 +173,9 @@ export default {
     selfPreparedMedicineQuery: '自备药查询',
     selfPreparedMedicineIndex: '自备药管理',
     selfPreparedMedicine: '自备药管理',
+    wareHouseManage:'仓库管理',
+    inventoryTransfer:'库存调拨',
+
     consumablesManagement: '耗材管理',
     warehouseReceipt: '出入库',
     warehouseReceiptOther: '出入库',

src/router/index.js

@@ -22,6 +22,8 @@ import slow from './modules/slow'
 import scrm from './modules/scrm'
 import shop from './modules/shop'
 import selfPreparedMedicine from './modules/selfPreparedMedicine'
+import wareHouseManage from './modules/wareHouseManage'
+import inventoryTransfer from './modules/inventoryTransfer'
 import drugs from './modules/drugs'
 import outpatientRegistration from './modules/outpatientRegistration'
 import outpatientDoctorStation from './modules/outpatientDoctorStation'
@@ -149,7 +151,9 @@ var _asy_router_map = [
   dialysis,
   stock,
   drugs,
-  selfPreparedMedicine,
+  selfPreparedMedicine,  //自备药管理模块
+  wareHouseManage,  //仓库管理模块
+  inventoryTransfer,    //库存调拨模块
   otherManagement,
   qcd,
   device,

src/router/modules/inventoryTransfer.js

@@ -0,0 +1,17 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/inventoryTransfer',
+  component: Layout,
+  name:'inventoryTransfer',
+  redirct: 'noredirect',
+  children: [{
+    path: '/stock/inventoryTransfer',
+    component: () => import('@/xt_pages/stock/inventoryTransfer/index.vue'),
+    name: '库存调拨',
+    meta: {
+      title: '库存调拨',
+      noCache: true
+    }
+  },]
+}

src/router/modules/wareHouseManage.js

@@ -0,0 +1,33 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+    path: '/stock/wareHouseManage',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'wareHouseManage',
+    alwaysShow: true,
+    meta: {
+        title: 'wareHouseManage',
+        icon: 'stock',
+        isChild: true
+    },
+    children: [
+        {
+            path: '/stock/warehousequery',
+            component: () => import('@/xt_pages/stock/warehouseManage/query'),
+            name: 'warehousequery',
+            meta: { title: '仓库信息', noCache: true },
+        },
+        {
+            path: '/stock/waresetting',
+            component: () => import('@/xt_pages/stock/warehouseManage/waresetting'),
+            name: 'waresetting',
+            hidden: true,
+            is_menu: false,    
+            meta: { title: '仓库设置', noCache: true },
+        }
+
+    ]
+
+
+}

src/views/layout/Layout.vue

@@ -130,7 +130,7 @@ export default {
     let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
-    let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];
+    let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];
     let kuyishopping = ['kuyiShopping'];

src/views/layout/components/Sidebar/index.vue

@@ -121,7 +121,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '库房管理'){
-          let nameArr = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];
+          let nameArr = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
           let routerArr = [];
           this.permission_routers.map(item => {
             if(nameArr.indexOf(item.name) > -1){

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -18,31 +18,26 @@
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="名称">
+      <el-table-column align="center" prop="name" width="400" label="名称">
         <template slot-scope="scope"
           ><span :title="scope.row.drug_name">{{
             scope.row.drug_name
           }}</span></template
         >
       </el-table-column>
-
-      <el-table-column align="center" prop="name" width="90" label="单次用量">
+      <el-table-column align="center" prop="name" width="80" label="单次用量">
         <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
-          <div>
-            {{ scope.row.single_dose }}&nbsp;&nbsp;{{
-              scope.row.single_dose_unit
-            }}
-          </div>
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div>{{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="用法">
+      <el-table-column align="center" prop="name" width="80" label="用法">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
           <div>{{ scope.row.delivery_way }}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="频率">
+      <el-table-column align="center" prop="name" width="80" label="频率">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_frequency }}</div>
 
@@ -50,32 +45,31 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="day" width="50" label="天数">
+      <el-table-column align="center" prop="day" width="80" label="天数">
         <template slot-scope="scope">{{ scope.row.day }}天</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="100" label="总量">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
-          <div>
-            {{ scope.row.prescribing_number }}&nbsp;&nbsp;{{
-              scope.row.prescribing_number_unit
-            }}
-          </div>
-        </template>
+      <el-table-column align="center" prop="name" width="80" label="总量">
+        <template slot-scope="scope"
+          >{{ scope.row.prescribing_number
+          }}{{ scope.row.prescribing_number_unit }}</template
+        >
       </el-table-column>
-      <el-table-column align="center" prop="name" width="60" label="单价">
+      <el-table-column align="center" prop="name" width="100" label="单价">
         <template slot-scope="scope">
-          <div>{{ scope.row.retail_price}}元</div>
+          <div>{{ scope.row.retail_price }}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="60" label="总价">
+
+      <el-table-column align="center" prop="name" width="100" label="总价">
         <template slot-scope="scope">
           <div>
             {{
-              (scope.row.prescribing_number * scope.row.retail_price).toFixed(2)
+              (scope.row.prescribing_number * scope.row.retail_price).toFixed(
+                2
+              )
             }}元
           </div>
 
@@ -83,13 +77,13 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+      <el-table-column align="center" prop="name" width="80" label="全自费金额">
         <template slot-scope="scope">
           <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+      <el-table-column align="center" prop="name" width="80" label="超限价金额">
         <template slot-scope="scope">
           <div>{{ scope.row.overlmt_amt }}元</div>
         </template>
@@ -98,7 +92,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="60"
+        width="80"
         label="先行自付金额"
       >
         <template slot-scope="scope">
@@ -109,7 +103,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="60"
+        width="70"
         label="符合正常范围金额"
       >
         <template slot-scope="scope">
@@ -117,7 +111,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="50" label="备注">
+      <el-table-column align="center" prop="name" width="60" label="备注">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
           <div>{{ scope.row.remark }}</div>
@@ -142,7 +136,12 @@
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column align="center" prop="project_name" width="100" label="名称">
+      <el-table-column
+        align="center"
+        prop="project_name"
+        width="400"
+        label="名称"
+      >
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column
@@ -155,15 +154,17 @@
           getGroup(scope.row.statistical_classification)
         }}</template>
       </el-table-column>
+
       <el-table-column
         align="center"
         prop="single_dose"
         width="80"
         label="单次用量"
       >
-        <template slot-scope="scope"
-          >{{ scope.row.single_dose }}{{ scope.row.unit }}</template
-        >
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          {{ scope.row.single_dose }}{{ scope.row.unit }}
+        </template>
       </el-table-column>
       <el-table-column
         align="center"
@@ -190,7 +191,7 @@
       <el-table-column
         align="center"
         prop="number_days"
-        width="50"
+        width="80"
         label="天数"
       >
         <template slot-scope="scope">
@@ -198,36 +199,35 @@
           {{ scope.row.number_days }}天
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="total" width="50" label="总量">
+
+      <el-table-column align="center" prop="total" width="80" label="总量">
         <template slot-scope="scope">
-          <div style="display: flex">
-            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
-            {{ scope.row.total }} {{ scope.row.unit }}
-          </div>
+          <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+          {{ scope.row.total }} {{ scope.row.unit }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+
+      <el-table-column align="center" prop="name" width="100" label="单价">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-          {{ scope.row.price.toFixed(2) }}元
+          {{ scope.row.price }}元
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="总价">
+       <el-table-column align="center" prop="name" width="100" label="总价">
         <template slot-scope="scope">
-          <div>{{ (scope.row.total * scope.row.price.toFixed(2)) }}元</div>
-
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+          {{ (scope.row.total * scope.row.price).toFixed(2) }}元
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+      <el-table-column align="center" prop="name" width="80" label="全自费金额">
         <template slot-scope="scope">
           <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+      <el-table-column align="center" prop="name" width="80" label="超限价金额">
         <template slot-scope="scope">
           <div>{{ scope.row.overlmt_amt }}元</div>
         </template>
@@ -236,7 +236,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="60"
+        width="80"
         label="先行自付金额"
       >
         <template slot-scope="scope">
@@ -247,7 +247,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="60"
+        width="70"
         label="符合正常范围金额"
       >
         <template slot-scope="scope">

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -6,7 +6,6 @@
       border
       style="width: 99%"
       :row-style="changColor"
-      :row-class-name="tableRowClassName"
       :header-cell-style="{
         color: '#606266',
       }"
@@ -19,7 +18,13 @@
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column fixed align="center" prop="name" width="400" label="名称">
+      <el-table-column
+        fixed
+        align="center"
+        prop="name"
+        width="400"
+        label="名称"
+      >
         <template slot-scope="scope"
           ><span :title="scope.row.drug_name">{{
             scope.row.drug_name
@@ -27,14 +32,10 @@
         >
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="70" label="单次用量">
+      <el-table-column align="center" prop="name" width="80" label="单次用量">
         <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
-          <div>
-            {{ scope.row.single_dose }}&nbsp;&nbsp;{{
-              scope.row.single_dose_unit
-            }}
-          </div>
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div>{{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="80" label="用法">
@@ -54,16 +55,8 @@
       <el-table-column align="center" prop="day" width="80" label="天数">
         <template slot-scope="scope">{{ scope.row.day }}天</template>
       </el-table-column>
-
       <el-table-column align="center" prop="name" width="80" label="总量">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
-          <div>
-            {{ scope.row.prescribing_number }}&nbsp;&nbsp;{{
-              scope.row.prescribing_number_unit
-            }}
-          </div>
-        </template>
+        <template slot-scope="scope">{{ scope.row.prescribing_number }}{{scope.row.prescribing_number_unit}}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="80" label="单价">
         <template slot-scope="scope">
@@ -163,7 +156,13 @@
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column fixed align="center" prop="project_name" width="400" label="名称">
+      <el-table-column
+        fixed
+        align="center"
+        prop="project_name"
+        width="400"
+        label="名称"
+      >
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column
@@ -347,17 +346,18 @@ export default {
   },
   methods: {
     changColor({ row, rowIndex }) {
-     if (rowIndex % 2 == 1) { // 变颜色的条件
-		return {
-		backgroundColor: "#C4E1FF",
-    color: '#303133'  // 这个return的就是样式 可以是color 也可以是backgroundColor
-		}
-	}else{
-    return {
-      backgroundColor:"#ACD6FF",
-      color: '#303133'
-    }
-  }
+      if (rowIndex % 2 == 1) {
+        // 变颜色的条件
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133", // 这个return的就是样式 可以是color 也可以是backgroundColor
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
     },
 
     getName(id) {

src/xt_pages/stock/inventoryTransfer/index.vue

@@ -0,0 +1,224 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <div>
+        <el-button type="warning" @click="approval">反审核</el-button>
+        <el-button type="warning" @click="examine">审核</el-button>
+        <el-button type="primary" @click="Add">新增</el-button>
+      </div>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          justify-content: flex-start;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <div>
+          <el-input
+            size="small"
+            style="width: 200px; margin-left: 10px"
+            class="filter-item"
+            v-model.trim="keywords"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >查看</el-button
+          >
+        </div>
+        <div>
+          单据日期：
+          <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          </el-date-picker>
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >查看</el-button
+          >
+        </div>
+      </div>
+      <el-table
+        :row-style="changColor"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        >
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.drug_name ? scope.row.drug_name : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.drug_spec ? scope.row.drug_spec : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="调出仓库" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="调入仓库" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核人" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核时间" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="260px">
+          <template slot-scope="scope">
+            <el-tooltip class="item" content="编辑" placement="top-start">
+              <el-button
+                icon="el-icon-edit-outline"
+                size="small"
+                type="primary"
+                @click="toEdit(scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="删除" placement="top-start">
+              <el-button
+                icon="el-icon-delete"
+                size="small"
+                type="danger"
+                @click="toDelete(scope.row, scope.row.$index)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="详情" placement="top-start">
+              <el-button
+                icon="el-icon-view"
+                size="small"
+                type="primary"
+                @click="toDetails(scope.row, scope.row.$index)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: "/stock/warehousequery", name: "库存调拨" },
+      ],
+      value1: "",
+      total: 0,
+      page: 1,
+      limit: 10,
+      tableData: [{}, {}],
+    };
+  },
+
+  methods: {
+    // 初始化数据
+    init() {},
+
+    // 反审核
+    approval() {},
+
+    // 审核
+    examine() {},
+
+    // 添加
+    Add() {},
+
+    // 删除
+    toDelete() {},
+
+    // 详情查看
+    toDetails() {},
+
+    // 表单全选
+    handleSelectionChange() {},
+
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.init();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.init();
+    },
+
+    // 表格样式
+    changColor({ rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133",
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

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

@@ -0,0 +1,91 @@
+<template>
+  <el-dialog
+    title="新增仓库信息"
+    :visible.sync="dialogVisible"
+    width="30%"
+  >
+    <div class="main_contain">
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        :label-position="labelPosition"
+        ref="ruleForm"
+        label-width="100px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="活动名称">
+          <span>SH-6732</span>
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="region">
+          <el-input v-model="ruleForm.name"></el-input>
+        </el-form-item>
+        <el-form-item label="仓库地址" prop="desc">
+          <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="resource">
+          <el-radio-group v-model="ruleForm.resource">
+            <el-radio label="启用"></el-radio>
+            <el-radio label="禁用"></el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="仓库管理员" prop="region">
+          <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="dialogVisible = false">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      labelPosition:'left',
+      ruleForm: {
+        name: "",
+        region: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        resource: "",
+        desc: "",
+      },
+      rules: {
+        region: [{ required: true, message: "请选择活动区域", trigger: "change" }],
+        type: [{
+            type: "array",
+            required: true,
+            message: "请至少选择一个活动性质",
+            trigger: "change",
+          },],
+        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
+      },
+    };
+  },
+  methods: {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.main_contain {
+  width: 60%;
+  display: flex;
+  flex-direction: column;
+  margin: 0 auto;
+  .main_list {
+    height: 30px;
+    display: flex;
+    line-height: 30px;
+  }
+}
+</style>

src/xt_pages/stock/warehouseManage/query.vue

@@ -0,0 +1,336 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          justify-content: space-between;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <div>
+          <el-input
+            size="small"
+            style="width: 200px; margin-left: 10px"
+            class="filter-item"
+            v-model.trim="keywords"
+            placeholder="药品名称"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+          >
+        </div>
+        <div>
+          <el-button size="small" type="primary" @click="AddWareHouse"
+            >新增</el-button
+          >
+          <el-button size="small" type="primary" @click="toPrint"
+            >设置</el-button
+          >
+        </div>
+      </div>
+
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        <el-table-column label="仓库编号" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.drug_name ? scope.row.drug_name : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.drug_spec ? scope.row.drug_spec : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库地址" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库管理员" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center" width="260px">
+          <template slot-scope="scope">
+            <el-tooltip class="item" content="编辑" placement="top-start">
+              <el-button
+                icon="el-icon-edit-outline"
+                size="small"
+                type="primary"
+                @click="toEdit(scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="禁用" placement="top-start">
+              <el-button
+                size="small"
+                type="danger"
+                @click="toDelete(scope.row, scope.row.$index)"
+                ><img
+                  src="../../../assets/purchase/ban.png"
+                  alt=""
+                  style="width: 12px"
+                />
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="删除" placement="top-start">
+              <el-button
+                icon="el-icon-delete"
+                size="small"
+                type="danger"
+                @click="toDelete(scope.row, scope.row.$index)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+
+    <AddWareHouse ref="AddWareHouse"></AddWareHouse>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getDictionaryDataConfig, getDataConfig } from "@/utils/data";
+import { getSelfStockQuery } from "@/api/drug/drug";
+import AddWareHouse from "./components/AddWareHouse.vue";
+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: {
+    BreadCrumb,
+    AddWareHouse,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: "/stock/warehousequery", name: "仓库管理" },
+      ],
+      keywords: "",
+      total: 0,
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time: "",
+      page: 1,
+      limit: 10,
+      tableData: [],
+      drugType: [],
+      type_name: 0,
+      stockOutData: [],
+    };
+  },
+  methods: {
+    getlist() {
+      var params = {
+        type_name: this.type_name,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        keywords: this.keywords,
+        page: this.page,
+        limit: this.limit,
+      };
+      console.log("params", params);
+      getSelfStockQuery(params).then((response) => {
+        if (response.data.state == 1) {
+          var stockQuery = response.data.data.stockQuery;
+          console.log("入库", stockQuery);
+          this.total = response.data.data.total;
+          console.log("total", this.total);
+          var stockOutQuery = response.data.data.stockOutQuery;
+          console.log("stockOut", stockOutQuery);
+          for (let i = 0; i < stockQuery.length; i++) {
+            for (let j = 0; j < stockOutQuery.length; j++) {
+              if (stockQuery[i].drug_name_id == stockOutQuery[j].drug_name_id) {
+                stockQuery[i].outCount = stockOutQuery[j].Count;
+                stockQuery[i].total =
+                  stockQuery[i].Count - stockOutQuery[j].Count;
+              }
+            }
+          }
+          console.log("表格数据", stockQuery);
+          this.tableData = stockQuery;
+        }
+      });
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist();
+    },
+
+    startTimeChange: function (val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.getlist();
+      }
+    },
+    endTimeChange: function (val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist();
+      }
+    },
+
+    search: function () {
+      this.getlist();
+    },
+    // 新增仓库
+    AddWareHouse() {
+      this.$refs.AddWareHouse.dialogVisible = true;
+    },
+    // 删除仓库
+    toDelete(val, index) {
+      this.$confirm("是否确认删除这条仓库信息?", "删除仓库信息", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$message.success("删除成功");
+        })
+        .catch(() => {});
+    },
+    // 编辑仓库
+    toEdit() {
+        this.$refs.AddWareHouse.dialogVisible = true;
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    changeTypeName() {
+      this.getlist();
+    },
+
+    //路由跳转 ----- 仓库设置
+    toPrint() {
+      this.$router.push({ path: "/stock/waresetting" });
+    },
+
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    getDictionaryDataConfig(module, filed_name) {
+      return getDictionaryDataConfig(module, filed_name);
+    },
+    getDataConfig(module, filed_name) {
+      return getDataConfig(module, filed_name);
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/warehouseManage/waresetting.vue

@@ -0,0 +1,119 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+
+      <el-button type="primary" @click="returnTo">返回</el-button>
+    </div>
+    <div class="app-container">
+      <div class="set-contanin">
+        <div class="select-list">
+          <div style="line-height: 36px; white-space: nowrap">
+            请选择耗材自动入库仓库：
+          </div>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="select-list">
+          <div style="line-height: 36px; white-space: nowrap">
+            请选择耗材自动出库仓库：
+          </div>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="select-list">
+          <div style="line-height: 36px; white-space: nowrap">
+            请选择药品自动入库仓库：
+          </div>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="select-list">
+          <div style="line-height: 36px; white-space: nowrap">
+            请选择药品自动出库仓库：
+          </div>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: false, name: "仓库管理" },
+        { path: false, name: "仓库设置" },
+      ],
+      options:[]
+    };
+  },
+
+  created(){
+
+  },
+
+  methods:{
+      returnTo(){
+          this.$router.back(-1)
+      }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.set-contanin {
+  width: 30%;
+  height: 50%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  /* 横竖都居中 */
+  margin: auto;
+  .select-list {
+    display: flex;
+    padding: 10px 0;
+  }
+}
+/deep/ .el-input__inner {
+  width: 202px;
+}
+</style>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -824,10 +824,18 @@ export default {
     },
   getAllPrice() {
       var total_price = 0;
+      console.log(this.recordInfo.tableList,'this.recordInfo.tableList')
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price += this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count - (this.recordInfo.tableList[i].supply_price*this.recordInfo.tableList[i].supply_count*(this.recordInfo.tableList[i].deposit_rate/100));
+        total_price += 
+        this.recordInfo.tableList[i].supply_price*
+        this.recordInfo.tableList[i].supply_count - 
+        (this.recordInfo.tableList[i].supply_price*
+        this.recordInfo.tableList[i].supply_count*
+        (this.recordInfo.tableList[i].deposit_rate/100));
+        console.log(total_price,'this.total_price')
       }
       this.total_price = total_price;
+      
       // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
       if(total_price > 0){
         return total_price.toFixed(2);
@@ -892,12 +900,12 @@ export default {
       var ids = this.$route.query.ids;
       getGoodOrderDetailList(id,ids).then((response) => {
         if (response.data.state == 1) {
+          console.log(response.data.data.list,'oooresponse.data.data.list')
           var out = response.data.data.out;
           this.id = out.id;
           this.supplier_name = out.supplier_id;
           this.rate_of_concession = out.rate_of_concession;
           this.discount_amount = out.discount_amount;
-
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.list;
           console.log("orderINFO233232232332", orderInfo);
@@ -977,8 +985,6 @@ export default {
                   orderInfo[i].unitList[0].name = goodList[j].packing_unit;
                   orderInfo[i].count =  this.getTotalStockCountSix(orderInfo[i].good_warehouse_info,orderInfo[i].warehouse_out_id)
                 }
-
-               
               }
               orderInfo[i].sum_count = orderInfo[i].count
               orderInfo[i].min_number = 0