Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/data.js

@@ -148,15 +148,23 @@ export function getBaseDrugLibList(params) {
 
 
 
-export function createMedicineInsurancePercent(params) {
+export function createMedicineInsurancePercent(params,module) {
   return request({
-    url: '/api/medicineinsurancepercent/create',
+    url: '/api/medicineinsurancepercent/create?module='+module,
     method: 'post',
     data: params
   })
 }
 
 
+export function getMedicineInsurancePercent(type_id,module) {
+  return request({
+    url: '/api/medicineinsurancepercent/get?type_id='+type_id+"&module="+module,
+    method: 'get',
+  })
+}
+
+
 export function createDrugUnitSafeguard(params) {
   return request({
     url: '/api/drugunitsafeguard/create',
@@ -167,3 +175,5 @@ export function createDrugUnitSafeguard(params) {
 
 
 
+
+

src/api/drug/drug_stock.js

@@ -42,7 +42,7 @@ export function getDrugWarehouseInfo(params) {
 
 export function getDrugSalesReturnList(params) {
   return request({
-    url: '/api/salesreturn/list',
+    url: '/api/drugsalesreturn/list',
     method: 'get',
     params: params
   })
@@ -355,6 +355,7 @@ export function getPrintStockGood(params) {
 }
 
 
+
 export function getWarehouseOutUser(params) {
   return request({
     url: '/api/drugwarehouseout/user',
@@ -362,3 +363,28 @@ export function getWarehouseOutUser(params) {
     params: params
   })
 }
+
+
+export function createDrugStockAutomaticReduceConfig(is_open) {
+  return request({
+    url: '/api/drugstock/automaticreduce/isopen?is_open='+is_open,
+    method: 'post',
+  })
+}
+
+export function getDrugStockAutomaticReduceConfig() {
+  return request({
+    url: '/api/drugstockautomaticreduce/get',
+    method: 'get',
+  })
+}
+
+
+
+
+
+
+
+
+
+

src/router/modules/stock.js

@@ -201,6 +201,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'salesReturnDetail', noCache: true }
+    }, {
+      path: '/drugstock/return/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnDetail'),
+      name: 'drugSalesReturnDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugSalesReturnDetail', noCache: true }
     },
     {
       path: '/stock/return/add',
@@ -364,6 +371,7 @@ export default {
         noCache: true
       }
     },
+
     {
       path: '/stock/drugs/stock/in',
       component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
@@ -394,30 +402,30 @@ export default {
     {
       path: '/stock/drugs/stock/cancel',
       component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
-      name: 'cancelDrugStockOrder',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'cancelDrugStockOrder', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/adjustPrice',
-      component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
-      name: 'drugsAdjustPrice',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsAdjustPrice', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/reportLoss',
-      component: () => import('@/xt_pages/stock/drugs/reportLoss'),
-      name: 'drugsReportLoss',
+      name: 'drugsStockCancel',
       hidden: true,
       is_menu: false,
       num: 3,
-      meta: { title: 'drugsReportLoss', noCache: true }
+      meta: { title: 'drugsStockCancel', noCache: true }
     },
+    // {
+    //   path: '/stock/drugs/stock/adjustPrice',
+    //   component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
+    //   name: 'drugsAdjustPrice',
+    //   hidden: true,
+    //   is_menu: false,
+    //   num: 3,
+    //   meta: { title: 'drugsAdjustPrice', noCache: true }
+    // },
+    // {
+    //   path: '/stock/drugs/stock/reportLoss',
+    //   component: () => import('@/xt_pages/stock/drugs/reportLoss'),
+    //   name: 'drugsReportLoss',
+    //   hidden: true,
+    //   is_menu: false,
+    //   num: 3,
+    //   meta: { title: 'drugsReportLoss', noCache: true }
+    // },
     {
       path: '/stock/drugs/stock/query',
       component: () => import('@/xt_pages/stock/drugs/query'),
@@ -427,23 +435,23 @@ export default {
       num: 3,
       meta: { title: 'drugsQuery', noCache: true }
     },
-    {
-      path: '/stock/drugs/stock/drugsSurplus',
-      component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
-      name: 'drugsSurplus',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsSurplus', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/drugsExpiryDate',
-      component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
-      name: 'drugsExpiryDate',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsExpiryDate', noCache: true }
-    },
+    // {
+    //   path: '/stock/drugs/stock/drugsSurplus',
+    //   component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
+    //   name: 'drugsSurplus',
+    //   hidden: true,
+    //   is_menu: false,
+    //   num: 3,
+    //   meta: { title: 'drugsSurplus', noCache: true }
+    // },
+    // {
+    //   path: '/stock/drugs/stock/drugsExpiryDate',
+    //   component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
+    //   name: 'drugsExpiryDate',
+    //   hidden: true,
+    //   is_menu: false,
+    //   num: 3,
+    //   meta: { title: 'drugsExpiryDate', noCache: true }
+    // },
   ]
 }

src/xt_pages/data/components/configure.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="page_configure">
         <div style="width:50%;padding-right:10px;">
-            <div class="cell clearfix" style='margin-bottom:10px;'>
-                <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-            </div>
+            <!--<div class="cell clearfix" style='margin-bottom:10px;'>-->
+                <!--<el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>-->
+                <!--<el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+            <!--</div>-->
             <!--<el-table :data="drugList" border style="width: 100%" :row-style="{ color: '#303133' }" -->
              <!--:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" -->
               <!--highlight-current-row-->

src/xt_pages/data/components/consumables.vue

@@ -2,13 +2,13 @@
   <div class="page_consumables">
     <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
       <div class="cell clearfix" style="margin-bottom:0;">
-        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model="keywords"
                   class="filter-item"/>
         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
                    @click="searchAction">搜索
         </el-button>
         <label class="title"><span class="name">是否启用</span> : </label>
-        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择">
+        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -17,7 +17,7 @@
           </el-option>
         </el-select>
         <label class="title"><span class="name">是否收费</span> : </label>
-        <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择">
+        <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -26,7 +26,7 @@
           </el-option>
         </el-select>
         <span style="color: #909399;font-size:14px;">耗材种类 : &nbsp;</span>
-        <el-select v-model="good_kind" style="width:140px;margin-right:10px;" placeholder="请选择">
+        <el-select v-model="good_kind" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeKind">
           <el-option
             v-for="item,index in  getDictionaryDataConfig('system','good_kind')"
             :key="index"
@@ -50,33 +50,47 @@
       </el-table-column>
       <el-table-column label="名称" align="center">
         <template slot-scope="scope">
-          {{ scope.row.specification_name }}
+          {{ scope.row.good_name }}
         </template>
       </el-table-column>
       <el-table-column prop="date" label="规格型号" align="center">
+        <template slot-scope="scope">
+        {{ scope.row.specification_name }}
+        </template>
 
       </el-table-column>
       <el-table-column prop="date" label="耗材种类" width="140" align="center">
-
+        <template slot-scope="scope">
+          {{ getGoodKind(scope.row.good_kind) }}
+        </template>
       </el-table-column>
       <el-table-column label="耗材编码" width="140" align="center">
-
+        <template slot-scope="scope">
+          {{ scope.row.good_code }}
+        </template>
       </el-table-column>
 
       <el-table-column label="最小单位" width="60" align="center">
-
+        <template slot-scope="scope">
+          {{ getGoodUnit(scope.row.good_unit) }}
+        </template>
       </el-table-column>
       <el-table-column label="零售价" width="60" align="center">
-
+        <template slot-scope="scope">
+          {{ scope.row.retail_price }}
+        </template>
       </el-table-column>
       <el-table-column label="状态" width="60" align="center">
+        <template slot-scope="scope">
+        {{ scope.row.good_status}}
+        </template>
 
       </el-table-column>
 
       <el-table-column prop="date" label="操作" width="300" align="center">
         <template slot-scope="scope">
           <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
-          <!--<el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>-->
+          <el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -94,8 +108,6 @@
       :total="total"
     >
     </el-pagination>
-
-    <!--<add-consumable ref="addConsumable"></add-consumable>-->
     <good-info-dailog ref="addConsumable"
                       :titles="goodInfo.goodInfoDialog.goodInfoTitle"
                       :formValue="goodInfo.goodInfoDialog.formValue"
@@ -104,12 +116,15 @@
                       v-on:dialog-comfirm="goodInfoDialogComfirm"
                       v-on:dialog-cancle="goodInfoDialogCancle"
     ></good-info-dailog>
+    <self-payment ref='selfPayment'></self-payment>
+
   </div>
 </template>
 
 <script>
   import GoodInfoDailog from '../../stock/Dialog/goodInfoDailog'
   import { getDictionaryDataConfig } from "@/utils/data";
+  import selfPayment from './selfPayment'
 
   import {
     createGoodInfo,
@@ -125,6 +140,7 @@
   export default {
     components: {
       GoodInfoDailog,
+      selfPayment
     },
     data() {
       return {
@@ -203,6 +219,39 @@
       }
     },
     methods: {
+      changeKind(val){
+        this.getList()
+
+      },
+      changeCharge(val){
+        this.getList()
+
+      },
+      changeUser(val){
+        this.getList()
+
+
+      },
+      getGoodUnit(id){
+        for (let i = 0; i <this.$store.getters.good_unit.length; i++ ){
+          if(id == this.$store.getters.good_unit[i].id){
+
+            return this.$store.getters.good_unit[i].name
+          }
+        }
+        return ""
+      },
+      getGoodKind(id){
+        var data = this.getDictionaryDataConfig('system','good_kind')
+        var name = ""
+        for(let i = 0; i < data.length; i++){
+          if(id == data[i].id){
+            name = data[i].name
+          }
+
+        }
+        return name
+      },
       getDictionaryDataConfig(module,filed_name){
         return getDictionaryDataConfig(module,filed_name)
 
@@ -408,7 +457,7 @@
 
 
 
-            this.$refs.addConsumable.show()
+            this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
           }
         })
       },
@@ -480,9 +529,11 @@
             return false
           } else {
             this.goodInfo.loading = false
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.goodInfo.goodInfoData.push(response.data.data.list[i])
-            }
+            this.getList()
+
+            // for (let i = 0; i < response.data.data.list.length; i++) {
+            //   this.goodInfo.goodInfoData.push(response.data.data.list[i])
+            // }
           }
         })
       },
@@ -498,25 +549,25 @@
               return false
             } else {
               this.$refs.addConsumable.hide()
-
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].specification_name =
-                response.data.data.goodInfo.specification_name
-              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].good_unit =
-                response.data.data.goodInfo.good_unit
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].buy_price = response.data.data.goodInfo.buy_price.toString()
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].sell_price = response.data.data.goodInfo.sell_price.toString()
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
+              this.getList()
+              // this.goodInfo.goodInfoData[
+              //   this.goodInfo.editGoodIndex
+              //   ].specification_name =
+              //   response.data.data.goodInfo.specification_name
+              // this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].good_unit =
+              //   response.data.data.goodInfo.good_unit
+              // this.goodInfo.goodInfoData[
+              //   this.goodInfo.editGoodIndex
+              //   ].buy_price = response.data.data.goodInfo.buy_price.toString()
+              // this.goodInfo.goodInfoData[
+              //   this.goodInfo.editGoodIndex
+              //   ].sell_price = response.data.data.goodInfo.sell_price.toString()
+              // this.goodInfo.goodInfoData[
+              //   this.goodInfo.editGoodIndex
+              //   ].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
+              // this.goodInfo.goodInfoData[
+              //   this.goodInfo.editGoodIndex
+              //   ].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
 
               this.$message.success('修改成功')
             }
@@ -529,9 +580,8 @@
               return false
             } else {
               this.$refs.addConsumable.hide()
-
-              this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
-
+              this.getList()
+              // this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
               this.$message.success('新增成功')
             }
           })
@@ -541,7 +591,6 @@
         this.$refs.addConsumable.hide()
       },
       showInfoDialog: function() {
-        this.$refs.addConsumable.show()
         this.getAllDealer()
         this.getAllManufacturer()
         this.goodInfo.goodInfoDialog.formValue.goodType = []
@@ -567,17 +616,8 @@
             }
           }
         })
-        this.goodInfo.goodInfoDialog.formValue.good_id = ''
-        this.goodInfo.goodInfoDialog.formValue.specification_name = ''
-        this.goodInfo.goodInfoDialog.formValue.buy_price = ''
-        this.goodInfo.goodInfoDialog.formValue.sell_price = ''
-        this.goodInfo.goodInfoDialog.formValue.remark = ''
-        this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
-        this.goodInfo.goodInfoDialog.formValue.good_type_id = ''
-        this.goodInfo.goodInfoDialog.formValue.dealer = ''
-        this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = ''
-        this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
-        this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
+        this.$refs.addConsumable.show()
+
       },
       getAllDealer: function() {
         this.goodInfo.goodInfoDialog.formValue.dealers = []
@@ -636,8 +676,12 @@
         this.getList()
       },
       searchAction() {
-      },clickSelfPayment(){
-
+        this.is_use = ""
+        this.is_charge = ""
+        this.good_kind = ""
+        this.getList()
+      },clickSelfPayment(id){
+      this.$refs.selfPayment.show(id,2)
       },
       openForm() {
 
@@ -699,7 +743,7 @@
         this.goodInfo.goodInfoDialog.formValue.agent = ''
         this.goodInfo.goodInfoDialog.formValue.good_number = ''
 
-        this.$refs.addConsumable.show()
+        this.$refs.addConsumable.show(0)
       }
     }, created() {
       this.getList()

src/xt_pages/data/components/drugs.vue

@@ -80,7 +80,7 @@
       <el-table-column prop="date" label="操作" width="400" align="center">
         <template slot-scope="scope">
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
-          <!--<el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>-->
+          <el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>
           <!--<el-button type="primary" size="small" @click="clickMainTain">单位维护</el-button>-->
           <!--<el-button type="danger" size="small">删除</el-button>-->
         </template>
@@ -339,8 +339,8 @@
       searchAction() {
         this.getList()
       },
-      clickSelfPayment() {
-        this.$refs.selfPayment.show()
+      clickSelfPayment(drug_id) {
+        this.$refs.selfPayment.show(drug_id,1)
       },
       clickMainTain() {
         // this.$refs.maintain.show();

src/xt_pages/data/components/selfPayment.vue

@@ -1,19 +1,20 @@
 <template>
-    <el-dialog
+  <el-dialog
     title="自付比例"
     width="660px"
     :visible.sync="visible"
     :before-close="_close"
   >
-    <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-        <el-table-column prop="name" label="医保类型" align="center"></el-table-column>
-        <el-table-column label="自付比例(%)" align="center">
-            <template slot-scope="scope">
-                <el-input v-model="input" placeholder="请输入内容"></el-input>
-            </template>
-        </el-table-column>
+    <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
+      <el-table-column prop="name" label="医保类型" align="center"></el-table-column>
+      <el-table-column label="自付比例(%)" align="center">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.percent" placeholder="请输入内容"></el-input>
+        </template>
+      </el-table-column>
     </el-table>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="hide">取 消</el-button>
       <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
@@ -23,45 +24,172 @@
 
 
 <script>
-export default {
-    data(){
-        return{
-            visible: false,
-            tableData:[
+  import { createMedicineInsurancePercent, getMedicineInsurancePercent } from '@/api/data'
+
+  export default {
+    data() {
+      return {
+        visible: false,
+        module:0,
+        tableData: [
+          {
+            name: '深圳医保1档',
+            medicine_insurance_type: 1,
+            percent: '',
+            type_id: 0
+          },
+          {
+            name: '深圳医保2档',
+            medicine_insurance_type: 2,
+            type_id: 0,
+            percent: ''
+          },
+          {
+            name: '深圳医保3档',
+            medicine_insurance_type: 3,
+            type_id: 0,
+            percent: ''
+          },
+          {
+            name: '外地医保',
+            medicine_insurance_type: 4,
+            type_id: 0,
+            percent: ''
+          },
+          {
+            name: '自费',
+            medicine_insurance_type: 5,
+            percent: '',
+            type_id: 0
+          }
+        ]
+      }
+    },
+    methods: {
+
+      submitAction: function() {
+        let params = {
+          'mip': this.tableData
+        }
+        createMedicineInsurancePercent(params,this.module).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.hide()
+          }
+
+        })
+
+      },
+      _close: function(done) {
+        done()
+      },
+      show(id,module) {
+        this.module = module
+        this.tableData = []
+        getMedicineInsurancePercent(id,module).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              var temptableData = [
                 {
-                    name:'深圳医保1档',
-                    scale:0
+                  name: '深圳医保1档',
+                  medicine_insurance_type: 1,
+                  percent: '',
+                  type_id: id
                 },
                 {
-                    name:'深圳医保2档',
-                    scale:0
+                  name: '深圳医保2档',
+                  medicine_insurance_type: 2,
+                  type_id: id,
+                  percent: ''
                 },
                 {
-                    name:'深圳医保3档',
-                    scale:0
+                  name: '深圳医保3档',
+                  medicine_insurance_type: 3,
+                  type_id: id,
+                  percent: ''
                 },
                 {
-                    name:'外地医保',
-                    scale:0
+                  name: '外地医保',
+                  medicine_insurance_type: 4,
+                  type_id: id,
+                  percent: ''
                 },
                 {
-                    name:'自费',
-                    scale:0
-                },
-            ]
-        }
-    },
-    methods:{
-        _close: function(done) {
-            done()
-        },
-        show() {
-            this.visible = true
-        },
-        hide() {
-            // this.clear()
-            this.visible = false
-        },
+                  name: '自费',
+                  medicine_insurance_type: 5,
+                  percent: '',
+                  type_id: id
+                }
+              ]
+              this.tableData = temptableData
+
+              this.visible = true
+              for (let i = 0; i < this.tableData.length; i++) {
+                this.tableData[i].type_id = id
+              }
+              if (response.data.data.mip != null && response.data.data.mip.length > 0) {
+
+                for (let i = 0; i < response.data.data.mip.length; i++) {
+                  for (let a = 0; a < this.tableData.length; a++) {
+                    if (response.data.data.mip[i].medicine_insurance_type == this.tableData[a].medicine_insurance_type) {
+                      this.tableData[a].percent = response.data.data.mip[i].percent.toString()
+                    }
+                  }
+                }
+
+              }else{
+               var temptableData = [
+                  {
+                    name: '深圳医保1档',
+                    medicine_insurance_type: 1,
+                    percent: '',
+                    type_id: id
+                  },
+                  {
+                    name: '深圳医保2档',
+                    medicine_insurance_type: 2,
+                    type_id: id,
+                    percent: ''
+                  },
+                  {
+                    name: '深圳医保3档',
+                    medicine_insurance_type: 3,
+                    type_id: id,
+                    percent: ''
+                  },
+                  {
+                    name: '外地医保',
+                    medicine_insurance_type: 4,
+                    type_id: id,
+                    percent: ''
+                  },
+                  {
+                    name: '自费',
+                    medicine_insurance_type: 5,
+                    percent: '',
+                    type_id: id
+                  }
+                ]
+                this.tableData = temptableData
+
+
+
+              }
+
+            }
+
+          }
+        )
+
+      },
+      hide() {
+        // this.clear()
+        this.visible = false
+      }
     }
-}
+  }
 </script>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -5,11 +5,12 @@
              :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
-    <el-tabs v-model="activeName" >
+    <el-tabs v-model="activeName">
       <el-tab-pane label="基础数据" name="first">
         <div>
           <!--:rules="rules"-->
-          <el-form :model="form"  ref="form" :rules="rules" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+          <el-form :model="form" ref="form" :rules="rules" label-width="100px"
+                   style="display: flex;flex-wrap: wrap;justify-content: space-between;">
             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
               <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
@@ -52,7 +53,7 @@
             <el-form-item label="规格型号 : " prop="specification_name" style="width:100%">
               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="生产厂商 : " prop="manufacturer"  style="width:100%">
+            <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
               <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
                 <el-option
                   v-for="item,index in form.manufacturers"
@@ -82,7 +83,8 @@
               <el-input v-model="form.stock_warn_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="医保编码 : " prop="medical_insurance_number">
-              <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
+              <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder=""
+                        maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="是否特病目录:" prop="is_special_diseases">
               <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
@@ -115,17 +117,23 @@
               </el-select>
             </el-form-item>
             <!--<el-form-item label="代理商 : " prop="name" style="visibility: hidden;">-->
-              <!--<el-input style="width:160px;" v-model="form.agent" placeholder="" maxlength="30"></el-input>-->
+            <!--<el-input style="width:160px;" v-model="form.agent" placeholder="" maxlength="30"></el-input>-->
             <!--</el-form-item>-->
 
 
-
             <el-form-item label="状态 : " prop="good_status">
-              <el-radio-group v-model="form.good_status">
-                <el-radio :label="1">停用</el-radio>
-                <el-radio :label="2">收费</el-radio>
-              </el-radio-group>
+              <!--<el-radio-group v-model="form.good_status">-->
+              <!--<el-radio :label="1">停用</el-radio>-->
+              <!--<el-radio :label="2">收费</el-radio>-->
+              <!--</el-radio-group>-->
+
+              <el-checkbox-group v-model="good_status">
+                <el-checkbox label="停用">停用</el-checkbox>
+                <el-checkbox label="收费">收费</el-checkbox>
+              </el-checkbox-group>
             </el-form-item>
+
+
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
             </el-form-item>
@@ -133,7 +141,8 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="扩展数据" name="second">
-        <el-form :model="form"    label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+        <el-form :model="form" label-width="120px"
+                 style="display: flex;flex-wrap: wrap;justify-content: space-between;">
           <el-form-item label="默认使用数量:" prop="name">
             <el-input v-model="form.default_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
           </el-form-item>
@@ -215,10 +224,8 @@
     </el-tabs>
 
 
-
-
     <span slot="footer" class="dialog-footer">
-    <el-button  @click="cancle('form')">取 消</el-button>
+    <el-button @click="cancle('form')">取 消</el-button>
     <el-button type="primary" @click="comfirm('form')">保 存</el-button>
   </span>
   </el-dialog>
@@ -227,15 +234,15 @@
 
 
 <script>
-  import { getDictionaryDataConfig } from "@/utils/data";
+  import { getDictionaryDataConfig } from '@/utils/data'
 
   export default {
     name: 'goodInfoDailog',
     data() {
       return {
-        visible:false,
-        formTitle:'',
-        activeName:'first',
+        visible: false,
+        formTitle: '',
+        activeName: 'first',
         options: [{
           value: '1',
           label: '是'
@@ -245,8 +252,9 @@
         }],
         good_unit: '',
         isClose: false,
+        good_status: [],
         size: 11,
-        visibility:false,
+        visibility: false,
         form: {
           good_id: '',
           specification_name: '',
@@ -259,28 +267,28 @@
           expiry_date_warn_day_count: '',
           stock_warn_count: '',
           is_reuse: '2',
-          good_name:'',
-          pinyin:"",
-          wubi:"",
-          good_kind:'',
-          medical_insurance_level:'',
-          good_unit:'',
-          retail_price:'',
-          medical_insurance_number:'',
-          is_special_diseases:'',
-          is_record:'',
-          statistics_category:'',
-          agent:'',
-          good_status:'',
-          default_count:'',
-          sign:'',
-          is_default:'',
-          is_charge_use:'',
-          is_charge_predict:'',
-          is_statistics_work:'',
-          sort:'',
-          is_doctor_use:'',
-          good_number:'',
+          good_name: '',
+          pinyin: '',
+          wubi: '',
+          good_kind: '',
+          medical_insurance_level: '',
+          good_unit: '',
+          retail_price: '',
+          medical_insurance_number: '',
+          is_special_diseases: '',
+          is_record: '',
+          statistics_category: '',
+          agent: '',
+          good_status: '',
+          default_count: '',
+          sign: '',
+          is_default: '',
+          is_charge_use: '',
+          is_charge_predict: '',
+          is_statistics_work: '',
+          sort: '',
+          is_doctor_use: '',
+          good_number: ''
         },
 
         rules: {
@@ -305,18 +313,16 @@
           medical_insurance_level: [
             { required: true, message: '请输入医保等级', trigger: 'blur' }
           ],
-          manufacturer:[
+          manufacturer: [
             { required: true, message: '请选择生产厂商', trigger: 'blur' }
-          ],good_unit:[
+          ], good_unit: [
             { required: true, message: '请选择单位', trigger: 'blur' }
-          ],retail_price:[
+          ], retail_price: [
             { required: true, message: '请输入零价', trigger: 'blur' }
-          ],stock_warn_count:[
+          ], stock_warn_count: [
             { required: true, message: '请输入库存警戒', trigger: 'blur' }
           ]
 
-
-
         }
       }
     },
@@ -337,15 +343,66 @@
 
     },
     methods: {
-      getDictionaryDataConfig(module,filed_name){
-       return getDictionaryDataConfig(module,filed_name)
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
 
       },
-      show() {
+      show(id,form) {
         this.visible = true
-        console.log(this.getDictionaryDataConfig("system","drug_type"))
+        this.good_status =[]
+        if (id == 0) {
 
-      },  hide() {
+          var tempform = {
+              good_id: '',
+              specification_name: '',
+              buy_price: '',
+              sell_price: '',
+              remark: '',
+              manufacturer: '',
+              good_type_id: '',
+              dealer: '',
+              expiry_date_warn_day_count: '',
+              stock_warn_count: '',
+              is_reuse: '2',
+              good_name: '',
+              pinyin: '',
+              wubi: '',
+              good_kind: '',
+              medical_insurance_level: '',
+              good_unit: '',
+              retail_price: '',
+              medical_insurance_number: '',
+              is_special_diseases: '',
+              is_record: '',
+              statistics_category: '',
+              agent: '',
+              good_status: '',
+              default_count: '',
+              sign: '',
+              is_default: '',
+              is_charge_use: '',
+              is_charge_predict: '',
+              is_statistics_work: '',
+              sort: '',
+              is_doctor_use: '',
+              good_number: ''
+            }
+          this.good_status = []
+          for (let key in tempform) {
+            this.form[key] = tempform[key]
+          }
+        } else {
+          for (let key in form) {
+            this.form[key] = form[key]
+          }
+          if (this.form.good_status.length > 0) {
+            for (let i = 0; i < this.form.good_status.split(",").length; i++) {
+              this.good_status.push(this.form.good_status.split(',')[i])
+            }
+          }
+        }
+
+      }, hide() {
         this.visible = false
       },
       cancle: function(formName) {
@@ -383,7 +440,7 @@
         form['is_special_diseases'] = this.form.is_special_diseases
         form['is_record'] = this.form.is_record
         form['statistics_category'] = this.form.statistics_category
-        form['good_status'] = this.form.good_status
+        // form['good_status'] = this.form.good_status
         form['default_count'] = this.form.default_count
         form['sign'] = this.form.sign
         form['is_default'] = this.form.is_default
@@ -394,9 +451,7 @@
         form['is_doctor_use'] = this.form.is_doctor_use
         form['agent'] = this.form.agent
         form['good_number'] = this.form.good_number
-
-
-
+        form['good_status'] = this.good_status.join(',')
 
         return form
       }, changeSelected: function(val) {

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -264,7 +264,7 @@ export default {
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: "cancelStockOrderAdd",
+        name: "cancelDrugStockOrderAdd",
         query: { type: this.type }
       });
     },
@@ -390,7 +390,7 @@ export default {
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "cancelStockDetail",
+        name: "cancelDrugStockDetail",
         query: { id: row.id, type: this.type }
       });
     },

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -120,9 +120,9 @@
 
               <el-form-item style="padding-top: 15px">
                 <el-input
-                  placeholder="请输入商品类型"
-                  v-model="scope.row.good_type_id"
-                  :value="typeName(scope.row.good_type_id)"
+                  placeholder="请输入药品名称"
+                  v-model="scope.row.drug_id"
+                  :value="typeName(scope.row.drug_id)"
                   @focus="showDialog(scope.$index, scope.row)"
                 ></el-input>
               </el-form-item>
@@ -136,14 +136,35 @@
               <el-form-item style="padding-top: 15px">
                 <el-input
                   placeholder="请输入规格名称"
-                  v-model="scope.row.good_id"
-                  :value="specificationName(scope.row.good_id)"
+                  v-model="scope.row.drug_id"
+                  :value="specificationName(scope.row.drug_id)"
                   @focus="showDialog(scope.$index, scope.row)"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
 
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>进价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入单价"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
               <span>退库数量<span style="color: red">*</span></span>
@@ -162,6 +183,25 @@
               </el-form-item>
             </template>
           </el-table-column>
+
+          <el-table-column label="进价总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.return_count) }}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="零价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.retail_price }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.retail_price * scope.row.return_count) }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" min-width="20">
             <template slot-scope="scope">
               <el-tooltip
@@ -270,19 +310,20 @@ export default {
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
           if (i == 0) {
-            this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
-            this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-
+            this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
+            this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString();
+            this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString();
           } else {
             const tempForm = {}
             tempForm['drug_id'] = val.selectedGoodInfo[i].id
             tempForm["return_count"] = "";
+            tempForm["price"] = val.selectedGoodInfo[i].last_price.toString();
+            tempForm["retail_price"] =  val.selectedGoodInfo[i].retail_price.toString();
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
       }
       this.currentIndex = -1
-
     },
 
     cancle: function() {
@@ -322,7 +363,7 @@ export default {
 
     },
 
-    typeName: function(good_type_id) {
+    typeName: function(drug_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
@@ -332,7 +373,7 @@ export default {
       }
       return name;
     },
-    specificationName: function(good_info_id) {
+    specificationName: function(drug_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
@@ -345,6 +386,9 @@ export default {
       const tempObj = {};
       tempObj["drug_id"] = 0;
       tempObj["return_count"] = "";
+      tempObj["price"] = "";
+      tempObj["retail_price"] = "";
+
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -495,6 +539,10 @@ export default {
     tempObj["good_type_id"] = 0;
     tempObj["good_id"] = 0;
     tempObj["return_count"] = "";
+    tempObj["price"] = "";
+    tempObj["retail_price"] = "";
+
+
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -73,8 +73,8 @@
 
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入药品类型" v-model="scope.row.good_type_id"
-                          :value="typeName(scope.row.good_type_id)"
+                <el-input placeholder="请输入药品类型" v-model="scope.row.drug_id"
+                          :value="typeName(scope.row.drug_id)"
                           @focus="showDialog(scope.$index, scope.row)"></el-input>
               </el-form-item>
             </template>
@@ -86,14 +86,34 @@
             <template slot-scope="scope">
 
               <el-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入药品规格名称" v-model="scope.row.good_id"
-                          :value="specificationName(scope.row.good_id)"
+                <el-input placeholder="请输入药品规格名称" v-model="scope.row.drug_id"
+                          :value="specificationName(scope.row.drug_id)"
                           @focus="showDialog(scope.$index, scope.row)"></el-input>
               </el-form-item>
 
             </template>
           </el-table-column>
 
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>进价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入单价"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
@@ -107,6 +127,25 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="进价总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.count) }}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="零价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.retail_price }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.retail_price * scope.row.count) }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="操作" align="center" min-width="20">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
@@ -155,7 +194,7 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '耗材退库单' },
+          { path: false, name: '药品退库单' },
           { path: false, name: '编辑退库单' }
         ],
 
@@ -220,12 +259,18 @@
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
+
               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
+              this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
+
             } else {
               const tempForm = {}
               tempForm['id'] = 0
               tempForm['drug_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
+              tempForm['price'] = val.selectedGoodInfo[i].last_price.toString()
+              tempForm['retail_price'] =  val.selectedGoodInfo[i].retail_price.toString()
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
@@ -234,6 +279,11 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
+      },calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
       },
       GetConfigInfo: function() {
         const loading = this.$loading({
@@ -266,7 +316,7 @@
 
       },
 
-      typeName: function(good_type_id) {
+      typeName: function(drug_id) {
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
@@ -275,7 +325,7 @@
           }
         }
         return name;
-      },  specificationName: function(good_info_id) {
+      },  specificationName: function(drug_id) {
         console.log(this.goodInfo)
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
@@ -289,6 +339,10 @@
         tempObj['id'] = 0
         tempObj['drug_id'] = 0
         tempObj['count'] = ''
+        tempObj['price'] = ''
+        tempObj['retail_price'] = ''
+
+
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {
@@ -413,6 +467,8 @@
           } else {
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              response.data.data.list[i].price = response.data.data.list[i].price.toString()
+              response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.cancelStock = response.data.data.info
@@ -425,6 +481,8 @@
             tempObj['id'] = 0
             tempObj['drug_id'] = 0
             tempObj['count'] = ''
+            tempObj['price'] = ''
+            tempObj['retail_price'] = ''
             this.recordInfo.recordData.push(tempObj)
           }
         })

src/xt_pages/stock/drugs/drugSalesReturnEdit.vue

@@ -106,6 +106,33 @@
               </template>
             </el-table-column>
 
+            <el-table-column align="center" width="150">
+              <template slot="header" slot-scope="scope">
+                <span>进价<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+                <el-form-item
+                  :prop="'recordData.' + scope.$index + '.price'"
+                  :rules="tableRules.price"
+                  style="padding-top: 17px"
+                >
+                  <el-input
+                    placeholder="请输入进价"
+                    type="number"
+                    v-model="scope.row.price"
+                  ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="进货总价" align="center" width="80">
+              <template slot-scope="scope">
+                {{ calculate(scope.row.price * scope.row.count) }}
+              </template>
+            </el-table-column>
+
+
 
             <el-table-column min-width="23" align="center">
               <template slot="header" slot-scope="scope">
@@ -119,6 +146,19 @@
               </template>
             </el-table-column>
 
+            <el-table-column label="零价" align="center" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.retail_price }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="零价总价" align="center" width="80">
+              <template slot-scope="scope">
+                {{ calculate(scope.row.retail_price * scope.row.count) }}
+              </template>
+            </el-table-column>
+
+
             <el-table-column label="操作" align="center" min-width="20">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" content="新增" placement="top">
@@ -227,12 +267,16 @@
           for (let i = val.selectedGoodInfo.length -1; i >= 0 ; i--) {
             if (i == 0) {
               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
+              this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
+
             } else {
               const tempForm = {}
               tempForm['id'] = 0
               tempForm['drug_id'] = val.selectedGoodInfo[i].id
-              tempForm['return_count'] = ''
-              tempForm['price'] = ''
+              tempForm['count'] = ''
+              tempForm['price'] = val.selectedGoodInfo[i].last_price.toString()
+              tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
@@ -295,6 +339,8 @@
         tempObj['id'] = 0
         tempObj['drug_id'] = 0
         tempObj['count'] = ''
+        tempObj['price'] = ''
+        tempObj['retail_price'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         console.log(row.id)
@@ -327,6 +373,12 @@
         } else {
           return ''
         }
+      },calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+
+        return Math.round(parseFloat(val) * 100) / 100
       },
       showDialog(index, row) {
         this.currentIndex = index;
@@ -418,6 +470,9 @@
           } else {
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              response.data.data.list[i].price = response.data.data.list[i].price.toString()
+              response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
+
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.salesReturn = response.data.data.salesReturn
@@ -431,6 +486,10 @@
             tempObj['id'] = 0
             tempObj['drug_id'] = 0
             tempObj['count'] = ''
+            tempObj['price'] = ''
+            tempObj['retail_price'] = ''
+
+
             this.recordInfo.recordData.push(tempObj)
           }
         })

src/xt_pages/stock/drugs/drugSalesReturnOrder.vue

@@ -260,7 +260,7 @@ export default {
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: "salesReturnOrderAdd",
+        name: "drugSalesReturnOrderAdd",
         query: { type: this.type }
       });
     },
@@ -387,7 +387,7 @@ export default {
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "salesReturnDetail",
+        name: "drugSalesReturnDetail",
         query: { id: row.id, type: this.type }
       });
     },

src/xt_pages/stock/drugs/drugSalesReturnOrderAdd.vue

@@ -96,7 +96,34 @@
             </template>
           </el-table-column>
 
-          <el-table-column min-width="23" align="center">
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>进价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入进价"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="进货总价" align="center" width="80">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.return_count) }}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column align="center"  width="150">
             <template slot="header" slot-scope="scope">
               <span>退货数量<span style="color: red">*</span></span>
             </template>
@@ -108,7 +135,21 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column label="零价" align="center" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.retail_price }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价总价" align="center" width="80">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.retail_price * scope.row.return_count) }}
+            </template>
+          </el-table-column>
+
+
+
+          <el-table-column label="操作" align="center" min-width="60">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -155,7 +196,7 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '耗材退货单' },
+          { path: false, name: '药品退货单' },
           { path: false, name: '新增退货单' }
         ],
         crumbs2: [
@@ -198,7 +239,8 @@
         manufacturer: [],
         dealer: [],
         goodType: [],
-        goodInfo:[]
+        goodInfo:[],
+        numbers:[],
 
       }
     },
@@ -208,13 +250,16 @@
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length -1; i >= 0 ; i--) {
               if (i == 0) {
-                this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
-                this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+                this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
+                this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
+                this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
+
               } else {
                 const tempForm = {}
                 tempForm['drug_id'] = val.selectedGoodInfo[i].id
                 tempForm['return_count'] = ''
-                tempForm['price'] = ''
+                tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
+                tempForm['price'] =val.selectedGoodInfo[i].last_price.toString()
                 this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
               }
           }
@@ -249,6 +294,11 @@
                 }
               }
             }
+            // for (let i = 0; i < response.data.data.numbers.length; i++){
+            //   if( response.data.data.numbers[i].number.length > 0) {
+            //     this.numbers.push(response.data.data.numbers[i])
+            //   }
+            // }
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
             this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
 
@@ -296,6 +346,15 @@
         } else {
           return ''
         }
+      },handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['drug_id'] = 0
+        tempObj['return_count'] = ''
+        tempObj['retail_price'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        this.recordInfo.recordData.push(tempObj)
       },
       showDialog(index, row) {
         const loading = this.$loading({
@@ -410,6 +469,8 @@
       const tempObj = {}
       tempObj['drug_id'] = 0
       tempObj['return_count'] = ''
+      tempObj['number'] = ''
+      tempObj['retail_price'] = ''
       tempObj['price'] = ''
       this.recordInfo.recordData.push(tempObj)
       console.log(this.recordInfo.recordData)

src/xt_pages/stock/drugs/drugSalesReturnOrderDetail.vue

@@ -92,7 +92,7 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '耗材退货单' },
+          { path: false, name: '退货药品单' },
           { path: false, name: '退货单详情' }
         ],
         crumbs2: [

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -149,13 +149,13 @@
 
           <el-table-column label="零价" align="center" width="150">
             <template slot-scope="scope">
-              <!--{{ // calculate(scope.row.price * scope.row.warehousing_count) }}-->
+              {{ scope.row.retail_price }}
             </template>
           </el-table-column>
 
           <el-table-column label="零价总价" align="center" width="150">
             <template slot-scope="scope">
-              <!--{{ calculate(scope.row.price * scope.row.warehousing_count) }}-->
+              {{ calculate(scope.row.retail_price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
           <el-table-column align="center" width="150">
@@ -279,8 +279,8 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '耗材入库单' },
-          { path: false, name: '新增入库单' }
+          { path: false, name: "药品入库单" },
+          { path: false, name: "新增入库单" }
         ],
         crumbs2: [
           { path: false, name: '库存管理' },
@@ -397,6 +397,8 @@
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
             if (i == 0) {
               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
+              this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
 
             } else {
               const tempForm = {}
@@ -406,7 +408,8 @@
               tempForm['product_date'] = ''
               tempForm['expiry_date'] = ''
               tempForm['warehousing_count'] = ''
-              tempForm['price'] = ''
+              tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
+              tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
@@ -474,6 +477,7 @@
         tempObj['product_date'] = ''
         tempObj['expiry_date'] = ''
         tempObj['warehousing_count'] = ''
+        tempObj['retail_price'] = ''
         tempObj['price'] = ''
         tempObj['remark'] = ''
         tempObj['dealer'] = ''
@@ -598,6 +602,7 @@
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
+            console.log(array)
             for (let i = 0; i < array.length; i++) {
 
               if (array[i].drug_id == 0) {
@@ -654,6 +659,7 @@
       tempObj['product_date'] = ''
       tempObj['expiry_date'] = ''
       tempObj['warehousing_count'] = ''
+      tempObj['retail_price'] = ''
       tempObj['price'] = ''
       tempObj['remark'] = ''
       tempObj['dealer'] = ''

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -186,13 +186,13 @@
 
           <el-table-column label="零价" align="center" width="150">
             <template slot-scope="scope">
-              <!--{{ // calculate(scope.row.price * scope.row.warehousing_count) }}-->
+              {{ scope.row.retail_price }}
             </template>
           </el-table-column>
 
           <el-table-column label="零价总价" align="center" width="150">
             <template slot-scope="scope">
-              <!--{{ calculate(scope.row.price * scope.row.warehousing_count) }}-->
+              {{ calculate(scope.row.retail_price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
           <el-table-column align="center" width="150">
@@ -318,8 +318,8 @@ export default {
     return {
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: false, name: "耗材入库单" },
-        { path: false, name: "编辑入库单" }
+        { path: false, name: "药品入库单" },
+        { path: false, name: "药品入库单" }
       ],
       crumbs2: [
         { path: false, name: "库存管理" },
@@ -380,6 +380,11 @@ export default {
           if (i == 0) {
             this.recordInfo.recordData[this.currentIndex].drug_id =
               val.selectedGoodInfo[i].id;
+            this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
+            this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
+
+
+
           } else {
 
             const tempForm = {};
@@ -389,10 +394,12 @@ export default {
             tempForm["product_date"] = "";
             tempForm["expiry_date"] = "";
             tempForm["warehousing_count"] = "";
-            tempForm["price"] = "";
+            tempForm["price"] = val.selectedGoodInfo[i].last_price.toString();
             tempForm["remark"] = "";
             tempForm["dealer"] = "";
             tempForm["manufacturer"] = "";
+            tempForm["retail_price"] = val.selectedGoodInfo[i].retail_price.toString();
+
             this.recordInfo.recordData.splice(
               this.currentIndex + 1,
               0,
@@ -472,6 +479,9 @@ export default {
       tempObj["remark"] = "";
       tempObj["dealer"] = "";
       tempObj["manufacturer"] = "";
+      tempObj['retail_price'] = ""
+
+
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -623,6 +633,11 @@ export default {
             response.data.data.info[i].price = response.data.data.info[
               i
             ].price.toString();
+
+            response.data.data.info[i].retail_price = response.data.data.info[
+              i
+              ].retail_price.toString();
+
             response.data.data.info[
               i
             ].warehousing_count = response.data.data.info[
@@ -653,6 +668,8 @@ export default {
             tempObj["remark"] = "";
             tempObj["dealer"] = "";
             tempObj["manufacturer"] = "";
+            tempObj['retail_price'] = ""
+
             this.recordInfo.recordData.push(tempObj);
           }
         }

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -373,7 +373,7 @@ export default {
 
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "stockOutDetail",
+        name: "drugStockOutDetail",
         query: { id: row.id, type: this.type }
       });
     },

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -138,7 +138,7 @@
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
-              <span>单价<span style="color: red">*</span></span>
+              <span>进价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
@@ -148,7 +148,7 @@
                 style="padding-top: 17px"
               >
                 <el-input
-                  placeholder="请输入单价"
+                  placeholder="请输入进价"
                   type="number"
                   v-model="scope.row.price"
                 ></el-input>
@@ -175,11 +175,26 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="总价" min-width="20" align="center">
+          <el-table-column label="进价总价" min-width="20" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.price * scope.row.count) }}
             </template>
           </el-table-column>
+
+
+          <el-table-column label="零价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.retail_price }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.retail_price * scope.row.count) }}
+            </template>
+          </el-table-column>
+
+
           <el-table-column label="备注" min-width="20" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -239,7 +254,7 @@ export default {
     return {
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: false, name: "耗材出库单" },
+        { path: false, name: "药品出库单" },
         { path: false, name: "新增出库单" }
       ],
       crumbs2: [
@@ -295,12 +310,15 @@ export default {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
           if (i == 0) {
             this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
+            this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
+            this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
 
           } else {
             const tempForm = {}
             tempForm['drug_id'] = val.selectedGoodInfo[i].id
+            tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
+            tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
             tempForm['count'] = ''
-            tempForm['price'] = ''
             tempForm['remark'] = ''
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
@@ -400,6 +418,7 @@ export default {
       tempObj["drug_id"] = 0;
       tempObj["count"] = "";
       tempObj["price"] = "";
+      tempObj["retail_price"] = "";
       tempObj["remark"] = "";
 
       this.recordInfo.recordData.push(tempObj);
@@ -492,12 +511,8 @@ export default {
           const array = this.recordInfo.recordData;
           let total = 0;
           for (let i = 0; i < array.length; i++) {
-            if (array[i].good_type_id == 0) {
-              this.$message.error("商品类型不能为空");
-              return;
-            }
-            if (array[i].good_id == 0) {
-              this.$message.error("规格名称不能为空");
+            if (array[i].drug_id == 0) {
+              this.$message.error("药品名称或者药品规格名称不能为空");
               return;
             }
             total = total + array[i].price * array[i].return_count;
@@ -510,7 +525,6 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
-          console.log(this.form.dealer);
 
           postDrugWarehouseOut(
             params,
@@ -557,6 +571,7 @@ export default {
     tempObj["price"] = "";
     tempObj["remark"] = "";
 
+
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue

@@ -114,7 +114,7 @@
     components: { BreadCrumb },
     created() {
       const order_id = this.$route.query.id
-      this.GetConfigInfo()
+      // this.GetConfigInfo()
       this.GetOrderDetail(order_id)
     },
     data() {
@@ -225,7 +225,7 @@
             this.pos = 0
           } else {
             // 判断当前元素与上一个元素是否相同
-            if (this.warehousingOutInfo.warehousingOutData[i].good_type_id === this.warehousingOutInfo.warehousingOutData[i - 1].good_type_id) {
+            if (this.warehousingOutInfo.warehousingOutData[i].drug_id === this.warehousingOutInfo.warehousingOutData[i - 1].drug_id) {
               this.tempArr[this.pos] += 1
               this.tempArr.push(0)
             } else {
@@ -241,7 +241,7 @@
           if (index === 0) {
             sameRowArr.push([index])
           } else {
-            if (item.good_type_id === this.warehousingOutInfo.warehousingOutData[index - 1].good_type_id) {
+            if (item.drug_id === this.warehousingOutInfo.warehousingOutData[index - 1].drug_id) {
               sameRowArr[sIdx].push(index)
             } else {
               sIdx = sIdx + 1

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -113,7 +113,7 @@
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
-              <span>单价<span style="color: red">*</span></span>
+              <span>进价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
@@ -138,11 +138,26 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="总价" min-width="20" align="center">
+          <el-table-column label="进价总价" min-width="20" align="center">
             <template slot-scope="scope">
               {{calculate(scope.row.price*scope.row.count)}}
             </template>
           </el-table-column>
+
+
+          <el-table-column label="零价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.retail_price }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.retail_price * scope.row.count) }}
+            </template>
+          </el-table-column>
+
+
           <el-table-column label="备注" min-width="20" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -194,7 +209,7 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '耗材出库单' },
+          { path: false, name: '药品出库单' },
           { path: false, name: '编辑出库单' }
         ],
         crumbs2: [
@@ -258,18 +273,26 @@
         this.propForm.goods = [];
 
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+          for (let i = val.selectedGoodInfo.length - 1;i >= 0 ; i--) {
             if (i == 0) {
 
               this.recordInfo.recordData[this.currentIndex].drug_id =
                 val.selectedGoodInfo[i].id;
 
+              this.recordInfo.recordData[this.currentIndex].price =
+                val.selectedGoodInfo[i].last_price.toString();
+
+              this.recordInfo.recordData[this.currentIndex].retail_price =
+                val.selectedGoodInfo[i].retail_price.toString();
+
             } else {
               const tempForm = {};
               tempForm["id"] = 0;
               tempForm["drug_id"] = val.selectedGoodInfo[i].id;
+              tempForm["retail_price"] = val.selectedGoodInfo[i].retail_price.toString();
+
               tempForm["count"] = "";
-              tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
+              tempForm["price"] = val.selectedGoodInfo[i].last_price.toString();
               tempForm["remark"] = "";
               this.recordInfo.recordData.splice(
                 this.currentIndex + 1,
@@ -336,6 +359,8 @@
         const tempObj = {}
         tempObj['id'] = 0
         tempObj['drug_id'] = 0
+        tempObj['retail_price'] = ''
+
         tempObj['count'] = ''
         tempObj['price'] = ''
         tempObj['remark'] = ''
@@ -390,7 +415,7 @@
             this.$message.error(response.data.msg);
             return false;
           } else {
-            if (response.data.data.goodInfo.length <= 0) {
+            if (response.data.data.drugs.length <= 0) {
               this.$message.error("该厂商或经销商没有药品信息");
               return;
             }
@@ -460,6 +485,7 @@
           } else {
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
+              response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
@@ -474,6 +500,8 @@
             const tempObj = {}
             tempObj['id'] = 0
             tempObj['drug_id'] = 0
+            tempObj['retail_price'] = ''
+
             tempObj['count'] = ''
             tempObj['price'] = ''
             tempObj['remark'] = ''

src/xt_pages/stock/drugs/drugsStockDialog/index.vue

@@ -54,23 +54,34 @@
             property="drug_spec"
             style="word-break: keep-all;white-space:nowrap;"
           ></el-table-column>
+          <!--<el-table-column-->
+            <!--align="center"-->
+            <!--label="单位"-->
+            <!--property="good_unit"-->
+          <!--&gt;-->
+            <!--<template slot-scope="scope">-->
+              <!--&lt;!&ndash;<span>{{getName(scope.row.good_unit)}}</span>&ndash;&gt;-->
+            <!--</template>-->
+          <!--</el-table-column>-->
+
           <el-table-column
             align="center"
-            label="单位"
-            property="good_unit"
+            label="上次进货价"
+            property="buy_price"
           >
             <template slot-scope="scope">
-              <!--<span>{{getName(scope.row.good_unit)}}</span>-->
+              <span>{{scope.row.last_price}}</span>
             </template>
           </el-table-column>
 
+
           <el-table-column
             align="center"
-            label="单价"
+            label="零售价"
             property="buy_price"
           >
             <template slot-scope="scope">
-              <!--<span>{{scope.row.buy_price}}</span>-->
+              <span>{{scope.row.retail_price}}</span>
             </template>
           </el-table-column>
 

src/xt_pages/stock/drugs/query.vue

@@ -1,193 +1,402 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <!--<bread-crumb :crumbs='crumbs'></bread-crumb>-->
       <bread-crumb :crumbs="crumbs"></bread-crumb>
-      <el-button
-        size="small"
-        @click="handleWarehouse"
-        class="filter-item"
-        style="float:right;"
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        >新增</el-button
-      >
     </div>
+    <div class="app-container ">
+      <div class="cell clearfix">
+        <el-input
+          size="small"
+          style="width: 400px;"
+          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 class="app-container">
-        <div class="cell clearfix">
-            <el-input
-            size="small"
-            style="width: 400px;"
-            v-model.trim="searchKey"
-            class="filter-item"
-            placeholder="单据编码/制单人/厂商"
-            />
-            <el-button
-            style="margin-right:10px;"
-            size="small"
-            class="filter-item"
-            type="primary"
-            icon="el-icon-search"
-            @click="search"
-            >搜索</el-button
-            >
-            <label class="title"><span class="name">报损日期</span> : </label>
-            <el-date-picker
-            size="small"
-            v-model="start_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px;"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="startTimeChange"
-            ></el-date-picker>
-            <span class="cellLine"> - </span>
-            <el-date-picker
-            size="small"
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px;"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="endTimeChange"
-            ></el-date-picker>
-        </div>
-
-        <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" prop="dialysis_no" label="单据编码">
-                <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="药品名称">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="dialysis_no" label="规格名称">
-                <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="批号">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="数量">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="原零价">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="现零价">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="操作人">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
-            </el-table-column>
-        </el-table>
-
-
-      
-
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[10, 50, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;float: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
+      <div class="cell clearfix">
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="setting"
+        >设置</el-button
         >
-        </el-pagination>
+      </div>
+
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :data="WarehouseInfo.warehouseInfoDate"
+        :class="signAndWeighBoxPatients"
+        border
+        v-loading="WarehouseInfo.loading"
+        :span-method="merge"
+
+      >
+        <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.drug_name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格名称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.drug_spec }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="入库数量" align="center">
+          <template slot-scope="scope">
+            <span
+              @click="showStockInDetailDialog(scope.row.drug_id)"
+            >{{ stockInCount(scope.row) }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="入库退货" align="center">
+          <template slot-scope="scope">
+            <span
+              @click="showSaleReturnDetailDialog(scope.row)"
+            >{{ salesReturnCount(scope.row) }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="实际入库" align="center">
+          <template slot-scope="scope">
+            {{ stockInCount(scope.row) - salesReturnCount(scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="出库数量" align="center">
+          <template slot-scope="scope">
+            <span
+              @click="showStockOutDetailDialog(scope.row.drug_id)"
+            >{{ stockOutCount(scope.row) }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="出库退库" align="center">
+          <template slot-scope="scope">
+            <span
+              @click="showCancelStockDetailDialog(scope.row)"
+            >{{ cancelStockCount(scope.row) }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="实际出库" align="center">
+          <template slot-scope="scope">
+            {{ stockOutCount(scope.row) - cancelStockCount(scope.row) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="剩余库存" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              stockInCount(scope.row) -
+                salesReturnCount(scope.row) -
+                stockOutCount(scope.row) +
+                cancelStockCount(scope.row)
+            }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
     </div>
+
+    <setting-dialog
+      ref="dialog"
+    ></setting-dialog>
+
   </div>
 </template>
 
 <script>
-import BreadCrumb from "../../components/bread-crumb";
-
-export default {
-  name: "stockIn",
-  components: { BreadCrumb },
-  created() {
-    
-  },
-  data() {
-    return {
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getAllDrugStockQueryList } from '@/api/drug/drug_stock'
+  import SettingDialog from './settingDialog/index'
+
+  export default {
+    name: "stockIn",
+    created() {
+      this.GetAllDrugStockQueryList();
+    },
+    components: {
+      SettingDialog,
+      BreadCrumb
+    },
+    data() {
+      return {
         crumbs: [
-            { path: false, name: "库存管理" },
-            { path: false, name: "入库单" }
+          { path: false, name: "库存管理" },
+          { path: "/stock/drugs/stock/query", name: "药品库存查询" }
         ],
-        searchKey: "",
-        tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-        }]
-      
-    };
-  },
-  methods: {
-    
-  }
-};
+        keywords: "",
+        total: 0,
+        multipleSelection: [],
+        signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+        start_time: "",
+        end_time: "",
+        page: 1,
+        limit: 10,
+        goodType: [],
+        goodInfo: [],
+        tempArr:[],
+        sameRowArr: [],
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        }
+      };
+    },
+    methods: {
+      handleSpanTempArr(){
+        this.tempArr = []
+
+        for (let i = 0; i < this.WarehouseInfo.warehouseInfoDate.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.WarehouseInfo.warehouseInfoDate[i].drug_name === this.WarehouseInfo.warehouseInfoDate[i - 1].drug_name) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.WarehouseInfo.warehouseInfoDate.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.drug_name === this.WarehouseInfo.warehouseInfoDate[index - 1].drug_name) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+
+
+
+      },
+      merge({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      },
+      GetAllDrugStockQueryList: function() {
+        console.log(this.keywords);
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords
+        };
+        this.WarehouseInfo.loading = true;
+        this.WarehouseInfo.warehouseInfoDate = [];
+        getAllDrugStockQueryList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.WarehouseInfo.loading = false;
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            this.WarehouseInfo.loading = false;
+            this.total = response.data.data.total;
+            for (let i = 0; i < response.data.data.list.length; i++) {
+
+              this.WarehouseInfo.warehouseInfoDate.push(
+                response.data.data.list[i]
+              );
+            }
+            this.handleSpanTempArr()
+          }
+        });
+      },
+      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;
+      },
+      GetAllGoodType: function() {
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              this.goodType.push(response.data.data.goodType[i]);
+            }
+          }
+        });
+      },
+      GetAllGoodInfo: function() {
+        GetAllGoodInfo().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+              this.goodInfo.push(response.data.data.goodInfo[i]);
+            }
+          }
+        });
+      },
+      handleBack: function() {
+        this.$router.go(-1);
+      },
+      handleSizeChange(val) {
+        this.limit = val;
+        this.GetAllStockQuery();
+      },
+      handleCurrentChange(val) {
+        this.page = val;
+        this.GetAllStockQuery();
+      },
+      calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100;
+      },
+      startTimeChange: function() {
+        this.GetAllStockQuery();
+      },
+      endTimeChange: function() {
+        this.GetAllStockQuery();
+      },
+      stockInCount: function(row) {
+        let total = 0;
+        for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
+          total = total + row.query_drug_warehousing_info[i].warehousing_count;
+        }
+        return total;
+      },
+      salesReturnCount: function(row) {
+        let total = 0;
+        for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
+          total = total + row.query_drug_sales_return_info[i].count;
+        }
+        return total;
+      },
+      stockOutCount: function(row) {
+        let total = 0;
+        for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
+          total = total + row.query_drug_warehouseout_info[i].count;
+        }
+        return total;
+      },
+      cancelStockCount: function(row) {
+        let total = 0;
+        for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
+          total = total + row.query_drug_cancel_stock_info[i].count;
+        }
+        return total;
+      },
+      showStockInDetailDialog: function(val) {},
+      showSaleReturnDetailDialog: function() {},
+      showStockOutDetailDialog: function() {},
+      showCancelStockDetailDialog: function() {},
+      search: function() {
+        this.GetAllStockQuery();
+      },setting:function() {
+        this.$refs.dialog.show()
+      }
+    }
+  };
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-.information {
-  border: 1px #dcdfe6 solid;
-  padding: 30px 20px 30px 20px;
+  .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;
-}
+  .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;
-}
+  .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/drugs/settingDialog/index.vue

@@ -0,0 +1,107 @@
+<template>
+  <el-dialog title="设置" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+    <div style="text-align: center;">
+
+      <div>
+        <el-button type="primary" v-if="!is_open" @click="changeOpen(1)">启用自动扣减</el-button>
+        <el-button type="danger" v-if="is_open" @click="changeOpen(2)">关闭自动扣减</el-button>
+        <div style="margin-top: 40px;"><p style="color:#909399;text-align: center;">
+          启用“药品管理”后，在开透析医嘱时，医生可以选择药品后将自动产生出库单</p></div>
+      </div>
+    </div>
+
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="hide()">取 消</el-button>
+  </span>
+  </el-dialog>
+
+</template>
+
+<script>
+  import { createDrugStockAutomaticReduceConfig, getDrugStockAutomaticReduceConfig } from '@/api/drug/drug_stock'
+
+  export default {
+    name: 'settingDialog',
+    data() {
+      return {
+        is_open: false,
+        visibility: false,
+        isClose: false
+      }
+    },
+    props: {
+      propForm: {
+        type: Object
+      }
+    },
+    methods: {
+      hide: function() {
+        this.visibility = false
+      },
+      show: function() {
+        this.getConfig()
+        this.visibility = true
+
+      }, changeOpen(val) {
+        var message = ''
+        if (val == 1) {
+          message = '启用药品自动扣减功能'
+        } else {
+          message = '关闭药品自动扣减功能'
+        }
+
+        this.$confirm(message, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'info'
+        }).then(() => {
+          createDrugStockAutomaticReduceConfig(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.is_open == 1) {
+                this.is_open = true
+                this.$message({
+                  type: 'success',
+                  message: '已启用'
+                })
+              } else {
+                this.is_open = false
+                this.$message({
+                  type: 'success',
+                  message: '已关闭'
+                })
+              }
+            }
+          })
+        }).catch(() => {
+
+        })
+
+      },
+      getConfig() {
+        getDrugStockAutomaticReduceConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var config = response.data.data.config
+            if (config.is_open == 1) {
+              this.is_open = true
+            } else {
+              this.is_open = false
+            }
+          }
+        })
+      }
+    }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>