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

src/api/drug/drug_stock.js

@@ -356,7 +356,7 @@ export function getPrintStockGood(params) {
 
 
 
-export function getWarehouseOutUser(params) {
+export function getDrugWarehouseOutUser(params) {
   return request({
     url: '/api/drugwarehouseout/user',
     method: 'get',
@@ -388,3 +388,5 @@ export function getDrugStockAutomaticReduceConfig() {
 
 
 
+
+

src/lang/zh.js

@@ -149,7 +149,7 @@ export default {
     RescueRecord: '抢救记录',
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
-    
+
     otherManagement:'其他管理',
     drugsExpiryDate:'药品有效期预警',
     drugsSurplus:'药品剩余预警',
@@ -230,6 +230,7 @@ export default {
     bedManagement:'床位管理',
     dictionaryManagement:'字典管理',
     templateManagement:'模板管理',
+    drugStockUserDetail:"出库人明细",
 
   },
   navbar: {

src/router/modules/drugs.js

@@ -122,6 +122,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelDrugStockDetail', noCache: true }
+    },{
+      path: '/drugstock/user/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockUserDetail'),
+      name: 'drugStockUserDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockUserDetail', noCache: true }
     },
   ]
 }

src/xt_pages/data/components/consumables.vue

@@ -43,11 +43,7 @@
       :data="goodInfo.goodInfoData"
       v-loading="goodInfo.loading"
     >
-      <el-table-column label="商品编码" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.good_code }}
-        </template>
-      </el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column label="名称" align="center">
         <template slot-scope="scope">
           {{ scope.row.good_name }}

src/xt_pages/data/components/drugs.vue

@@ -39,11 +39,8 @@
     </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-      <el-table-column
-        type="index"
-        label="药品编码"
-        width="50">
-      </el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+
       <el-table-column prop="date" label="药品名称" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.drug_name}}</div>

src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue

@@ -204,7 +204,7 @@
         this.$emit('edit-record')
       },jump(row){
         this.$router.push({
-          name: 'user_detail',
+          name: 'drugStockUserDetail',
           query: { id: row.id }
         })
       },merge({ row, column, rowIndex, columnIndex }) {

src/xt_pages/stock/drugs/drugStockUserDetail.vue

@@ -11,8 +11,8 @@
       </div>
 
       <div class="cell clearfix">
-        <span style="width: 300px;color: #606266">商品类型: {{userList[0].type.type_name}} </span>
-        <span style="width: 300px;color: #606266">规格名称: {{userList[0].info.specification_name}}</span>
+        <span style="width: 300px;color: #606266">商品类型: {{userList[0].drug.drug_name}} </span>
+        <span style="width: 300px;color: #606266">规格名称: {{userList[0].drug.drug_spec}}</span>
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -64,8 +64,8 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import { getWarehouseOutUser } from '@/api/stock'
-  import BreadCrumb from '../components/bread-crumb'
+  import { getDrugWarehouseOutUser } from '@/api/drug/drug_stock'
+  import BreadCrumb from '../../components/bread-crumb'
 
   export default {
     name: 'stockInOrderDetail',
@@ -88,27 +88,11 @@
       }
     },
     methods: {
-      getSpecificationName: function(id) {
-        let name = ''
-        for (let i = 0; i < this.goodInfo.length; i++) {
-          if (this.goodInfo[i].id == id) {
-            name = this.goodInfo[i].specification_name
-          }
-        }
-        return name
-      }, getTypeName: function(id) {
-        let name = ''
-        for (let i = 0; i < this.goodType.length; i++) {
-          if (this.goodType[i].id == id) {
-            name = this.goodType[i].type_name
-          }
-        }
-        return name
-      }, GetOrderDetail: function(order_id) {
+    GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
-        getWarehouseOutUser(params).then(response => {
+        getDrugWarehouseOutUser(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false