11月14日 库存扣减更新

src/xt_pages/data/components/consumables.vue

@@ -34,6 +34,15 @@
             :value="item.value">
           </el-option>
         </el-select>
+        <span style="color: #909399;font-size:14px;">耗材类型 : &nbsp;</span>
+        <el-select v-model="is_type" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeTypeList">
+          <el-option
+            v-for="(item,index) in goodTypeList"
+            :key="index"
+            :label="item.type_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
 
       </div>
       <div>
@@ -94,9 +103,9 @@
           {{ getGoodTypeByID(scope.row.good_type_id) }}
         </template>
       </el-table-column>
-      <el-table-column label="耗材编号" width="140" align="center">
+      <el-table-column label="注册编码" width="140" align="center">
         <template slot-scope="scope">
-          {{ scope.row.good_number }}
+          {{ scope.row.register_number }}
         </template>
       </el-table-column>
 
@@ -339,7 +348,9 @@
         dealers:[],
         exportLogVisible:false,
         logs: [],
-        goodKindList:[]
+        goodKindList:[],
+        goodTypeList:[{id:0,type_name:"全部"}],
+        is_type:0,
       }
     },
     methods: {
@@ -745,6 +756,7 @@
           is_charge: this.is_charge,
           is_mark:this.is_record,
           manufacturer:this.manufacturer,
+          is_type:this.is_type,
         };
 
         getGoodInfoList(params).then(response => {
@@ -790,7 +802,7 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-        console.log("val22222",val)
+        
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
@@ -858,9 +870,8 @@
       },
       goodInfoDialogCancle: function() {
         this.$refs.addConsumable.hide()
-      },getGoodTypeByID(id){
-        console.log( id)
-
+      },
+      getGoodTypeByID(id){
         let name = ""
         for(let i = 0;  i < this.goodInfo.goodInfoDialog.formValue.goodType.length;i++){
           if(this.goodInfo.goodInfoDialog.formValue.goodType[i].id == id){
@@ -883,9 +894,7 @@
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
               }
-              this.goodInfo.goodInfoDialog.formValue.goodType.push(
-                response.data.data.goodType[i]
-              )
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
             }
             if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
               this.$message.error('请先新增商品类型');
@@ -941,6 +950,11 @@
             this.$message.error(response.data.msg);
             return false
           } else {
+           
+            for(let i=0;i<response.data.data.goodType.length;i++){
+              this.goodTypeList.push(response.data.data.goodType[i])
+            }
+ 
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
@@ -1127,7 +1141,10 @@
         this.getList()
       },
       changeRecord(){
-         this.getList()
+        this.getList()
+      },
+      changeTypeList(){
+        this.getList()
       },
       handleSuccess({ results, header }) {
 

src/xt_pages/data/components/drugs.vue

@@ -65,6 +65,14 @@
           size="small"
         >下载日志
         </el-button>
+       <!-- <el-button
+          style="margin-left:10px;"
+          @click="exportList()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >点击导出
+        </el-button> -->
       </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
@@ -99,6 +107,16 @@
         <template slot-scope="scope">
           <div>{{scope.row.retail_price}}</div>
         </template>
+      </el-table-column>
+      <el-table-column label="拆零价" width="100" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.min_price}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="包装价" width="100" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.retail_price}}</div>
+        </template>
       </el-table-column>
        <el-table-column prop="date" label="国家编码" width="100" align="center">
         <template slot-scope="scope">
@@ -120,7 +138,7 @@
           <div>{{getDealer(scope.row.dealer)}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="备案日期" align="center" width="100">
+      <!-- <el-table-column prop="date" label="备案日期" align="center" width="100">
         <template slot-scope="scope">
           <span>{{getTime(scope.row.record_date)}}</span>
         </template>
@@ -129,7 +147,7 @@
         <template slot-scope="scope">
           <div>{{scope.row.drug_remark}}</div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="状态" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.drug_status.indexOf('停用') == -1 ? '启用':'停用' }}</div>
@@ -167,7 +185,7 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :page-sizes="[10, 50, 100]"
+      :page-sizes="[10, 50, 100,500,1000]"
       :page-size="10"
       background
       align="right"
@@ -1451,6 +1469,33 @@
         return getDictionaryDataConfig(module,filed_name)
       },
 
+      exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         
+        
+         console.log("this.table",this.list)
+         for(let i=0;i<this.list.length;i++){
+            this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
+
+         }
+         const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
+         const filterVal = ['drug_name', 'specification_name', 'dose','dose','dose_unit','min_number','min_unit','max_unit','drug_stock_limit','drug_origin_place','drug_dosage_form','min_price','retail_price','last_price','drug_classify','drug_dose','drug_dose_unit','manufacturer','dealer','medical_insurance_number','social_security_directory_code'] 
+         
+         const data = this.formatJson(filterVal,this.list)
+     
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品信息'
+         })
+          this.downloadLoading = false
+    
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+
     },
     created() {
 

src/xt_pages/data/specialDictionary.vue

@@ -18,21 +18,18 @@
         <inspection v-if="activeName == 4"></inspection>
         </el-tab-pane>
         <el-tab-pane label="生产厂商" name="5">
-          <!--<manufacturer></manufacturer>-->
+         
           <manufacturer v-if="activeName == 5"></manufacturer>
         </el-tab-pane>
         <el-tab-pane label="经销商" name="6">
-          <!--<supplier></supplier>-->
+         
           <dealer v-if="activeName == 6"></dealer>
         </el-tab-pane>
         <el-tab-pane label="疾病类型" name="7">
-        <!--<manufacturer></manufacturer>-->
+       
         <diagnosis v-if="activeName == 7"></diagnosis>
       </el-tab-pane>
-        <!--<el-tab-pane label="医疗类别" name="8">-->
-          <!--&lt;!&ndash;<manufacturer></manufacturer>&ndash;&gt;-->
-          <!--<diagnosis></diagnosis>-->
-        <!--</el-tab-pane>-->
+      
         <el-tab-pane label="附加收费配置" name="8">
           <addtion v-if="activeName == 8"></addtion>
         </el-tab-pane>

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -713,8 +713,8 @@ export default {
           this.org_template_info = resp.data.templateInfo
 
           this.records = this.records.concat(resp.data.schedules)
-
-
+          console.log("记录23323322332",this.records)
+ 
 
           for (const recordIndex in this.records) {
             var dlegh = 0

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -48,7 +48,7 @@
 
 
             <el-form-item label="规格型号 : " prop="specification_name">
-              <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
+              <el-input v-model="form.specification_name" placeholder=""></el-input>
             </el-form-item>
             <el-form-item prop="packing_unit"  label="包装单位:">
               <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">