批量打印

src/api/drug/drug_stock.js

@@ -1,6 +1,11 @@
 import request from '@/utils/request'
 
 export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
+  console.log("params----",params)
+  console.log("warehousintg",warehousing_time)
+  console.log("manufactureer_id",manufacturer_id)
+  console.log("dealer_id",dealer_id)
+  console.log("type",type)
   return request({
     url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
     method: 'post',

src/api/stock.js

@@ -386,6 +386,12 @@ export function DeleteWarehouseInfoItem(params) {
 }
 
 export function EditWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id) {
+  console.log("params",params)
+  console.log("warehousing",warehousing_time)
+  console.log("id",id)
+  console.log("type",type)
+  console.log("manufacturer_id",manufacturer_id)
+  console.log("dealer_id",dealer_id)
   return request({
     url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -51,17 +51,24 @@
         <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="疾病类型: " prop="name">
-        <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
+        <el-select v-model="case_history.sick" style="width:100%;" placeholder="请选择">
          <el-option
-            v-for="item in wayOptions"
-           :key="item.id"
-           :label="item.name"
-           :value="item.id"
-          />
+                v-for="(item,index) in sick"
+                :key="index"
+                :label="item.class_name"
+                :value="item.id">
+           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="诊断: " prop="name">
-        <el-input v-model="patientInfo.health_care_no" placeholder=""></el-input>
+         <el-select style="width:100%;" v-model="case_history.diagnose" placeholder="">
+              <el-option
+                v-for="(item,index) in diagnoses"
+                :key="index"
+                :label="item.class_name"
+                :value="item.id">
+              </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="过敏史: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder=""></el-input>
@@ -238,7 +245,7 @@
   import medicalRecord from './medicalRecord'
   import saveRecordTemplate from './saveRecordTemplate'
   import { getDictionaryDataConfig } from "@/utils/data";
-  import {  createCaseHistory } from '@/api/his/his'
+  import {  createCaseHistory,getInitData } from '@/api/his/his'
   import { getDataConfig } from "@/utils/data";
   import { getTemplateDetail,getMedicalTemplateList } from "@/api/project/project"
   export default {
@@ -303,8 +310,7 @@
         valueSix:'',
         valueSeven:'',
         diagnoses:[],
-        state1:"",
-        diagnose:""
+        sick:[],
       }
     },
     methods: {
@@ -376,7 +382,7 @@
 
 
       getTemplateDetail(id){
-          console.log("22222")
+         
           getTemplateDetail(id).then(response=>{
               if(response.data.state == 1){
                 var templatedetail =  response.data.data.templateDetail
@@ -390,8 +396,8 @@
                 this.case_history.diagnostic = templatedetail.diagnostic
                 this.case_history.doctor_advice = templatedetail.doctor_advice
                 this.case_history.remark = templatedetail.remark
-                this.sick = templatedetail.sick
-                this.diagnose = templatedetail.diagnose
+                this.case_history.sick = templatedetail.sick
+                this.case_history.diagnose = templatedetail.diagnose
               }
           })
         },
@@ -513,6 +519,7 @@
           } else {
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
+          
           }
         })
 
@@ -520,6 +527,7 @@
     },
     created(){
        this.getlist()
+       this.getInitData()
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
        console.log("232322323",this)
        if(this.patientInfo.gender = 1){
@@ -527,7 +535,7 @@
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-     this.getInitData()
+    
     },
     watch:{
       detalid:function(val){
@@ -546,10 +554,17 @@
         deep: true
       },
       case_history:function(val){
-        console.log("val",val)
-        if(val.breathing == 0){
-           this.case_history.breathing = ''
+        console.log("南京人明",this.case_history)
+        if(this.case_history.breathing == 0){
+           this.case_history.breathing = ""
+        }
+        if(this.case_history.sick == 0){
+          this.case_history.sick = ""
+        }
+        if(this.case_history.diagnose == 0){
+           this.case_history.diagnose = ""
         }
+        
       }
     }
   }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -497,13 +497,20 @@
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
                 var case_history = response.data.data.case_history
-                console.log("case_history22222222",case_history)
-                if (case_history.breathing  == 0) {
-                  case_history.breathing = ""
-                }
+                console.log("切换患者查询病历",case_history)
+               
                 this.case_history = case_history
                 this.info = response.data.data.info
                 this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+                 if (this.case_history.breathing  <= 0) {
+                    this.case_history.breathing = ""
+                }
+                if(this.case_history.sick <= 0){
+                  this.case_history.sick = ""
+                }
+                if(this.case_history.diagnose <= 0){
+                   this.case_history.diagnose = ""
+                }
                 if (this.case_history.temperature <= 0) {
                   this.case_history.temperature = ''
                 }
@@ -638,12 +645,20 @@
               this.case_history = response.data.data.case_history
               var case_history = response.data.data.case_history
               console.log("case_history22222222",case_history)
-              if (case_history.breathing  == 0) {
-                case_history.breathing = ""
-              }
+             
               this.case_history = case_history
               this.info = response.data.data.info
               this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+              if (this.case_history.breathing  <= 0) {
+                  this.case_history.breathing = ""
+              }
+              if(this.case_history.sick <= 0){
+                  this.case_history.sick = ""
+              }
+              if(this.case_history.diagnose <= 0){
+                   this.case_history.diagnose = ""
+              }
+
               if (this.case_history.temperature <= 0) {
                 this.case_history.temperature = ''
               }
@@ -762,6 +777,7 @@
 
       },
       currentChange(currentRow, oldCurrentRow){
+       
         let isShowDailog = false
         for (let i = 0; i < this.prescriptions.length; i++){
           if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -28,6 +28,14 @@
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
                </div>
+               
+              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
+                  <div class="drugsOne">{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+               </div>
 
           </div>
           <div class="doctorBox">
@@ -75,8 +83,8 @@ export default {
         prescriptionInfo:[],
         hisPatient:{},
         department:[],
-        prescriptions:[]
-        
+        prescriptions:[],
+        projectList:[]
       }
     },
    methods:{
@@ -126,6 +134,9 @@ export default {
             var hisPatient = response.data.data.hisPatient
             console.log("hisPatient",hisPatient)
             this.hisPatient = hisPatient
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
           }
        })
      },
@@ -199,7 +210,16 @@ export default {
 
         return total + addtotal
       },
-
+      
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
 
    },
    created(){

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -23,6 +23,8 @@
                 <div class="drugsOne">{{item.advice_name?item.advice_name:""}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</div>
                 <div style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
             </div>
+
+            
         </div>
         <div class="doctorBox">
             <p>医师：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -9,6 +9,14 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col>
+          <el-form-item label="耗材出库" prop="out_stock">
+             <el-radio v-model="out_stock" label="1">是</el-radio>
+             <el-radio v-model="out_stock" label="2">否</el-radio>
+          </el-form-item>     
+        </el-col>
+      </el-row>
       <el-row>
          <el-col >
           <el-form-item label="备注">
@@ -17,7 +25,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-
+   
 
     </el-form>
 
@@ -48,7 +56,8 @@ export default {
         type_name: [
           { required: true, message: "请输入类型名称", trigger: "blur" }
         ]
-      }
+      },
+       out_stock: '1'
     };
   },
   props: {
@@ -87,6 +96,7 @@ export default {
       form["type_name"] = this.formValue.type_name;
       form["remark"] = this.formValue.remark;
       form["isCreated"] = this.isCreated;
+      form['out_stock'] = this.out_stock;
       return form;
     }
   },

src/xt_pages/stock/Dialog/manufacturerOrDealerDialog.vue

@@ -20,12 +20,12 @@
       </el-col>
 
       <el-col :span="8">
-        <el-form-item label="拼音" prop="pinyin">
+        <el-form-item label="拼音">
           <el-input  v-model="formValue.pinyin"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="五笔" prop="wubi">
+        <el-form-item label="五笔">
           <el-input  v-model="formValue.wubi"></el-input>
         </el-form-item>
       </el-col>
@@ -119,11 +119,7 @@
           ],
           dealer_name: [
             {required: true, message: '请输入经销商名称', trigger: 'blur'},
-          ], pinyin: [
-            {required: true, message: '请输入拼音', trigger: 'blur'},
-          ], wubi: [
-            {required: true, message: '请输入五笔', trigger: 'blur'},
-          ],
+          ], 
 
         }
       }

src/xt_pages/stock/config/goodType.vue

@@ -313,9 +313,10 @@ export default {
           type_name: val.type_name,
           remark: val.remark,
           type_code: this.goodType.type_code,
-          id: this.goodType.editTypeId
+          id: this.goodType.editTypeId,
+          out_stock:val.out_stock,
         };
-
+      
         modifyGoodType(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -333,7 +334,9 @@ export default {
         });
       } else if (val.isCreated == 1) {
         //新增
+       
         createGoodType(val).then(response => {
+          
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false;

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -390,7 +390,8 @@
         this.propForm.formValue = {}
         this.propForm.isCreated = 1
         this.isVisibility = true
-      }, comfirm: function(val) {
+      }, 
+      comfirm: function(val) {
 
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
@@ -419,9 +420,11 @@
         }
 
         this.currentIndex = -1
-      }, cancle: function() {
+      }, 
+      cancle: function() {
         this.$refs.dialog.hide()
-      },  GetConfigInfo: function() {
+      },  
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
           text: 'Loading',

src/xt_pages/stock/stockInOrder.vue

@@ -124,8 +124,22 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="详情"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-search"
+                @click="handleSearch(scope.row.id)"
+              >
+              </el-button>
+            </el-tooltip>
             <el-tooltip
               class="item"
               effect="dark"
@@ -140,6 +154,7 @@
               >
               </el-button>
             </el-tooltip>
+
             <el-tooltip
               class="item"
               effect="dark"
@@ -170,10 +185,370 @@
       >
       </el-pagination>
     </div>
+
+
+
+    <el-dialog
+      title="详情"
+      :visible.sync="dialogVisible"
+      width="80%"
+     >
+      <span>
+        <div>
+          <el-row>
+           <span style="font-size: 18px;color: #606266">入库单详情</span>
+          </el-row>
+            <el-row style="float:left;">
+            <span style="color: #606266"
+              >入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span
+            >
+          </el-row>
+        </div>
+         <div class="cell clearfix">
+          <span style="width: 300px;color: #606266;float:right">单据日期:{{ WarehouseInfo.warehouse.warehousing_time | parseTime("{y}-{m}-{d}")}} </span>
+          <span style="width: 300px;color: #606266;float:right">厂商:{{ getManufactuerName(WarehouseInfo.warehouse.manufacturer) }}</span>
+          <span style="width: 300px;color: #606266"
+            >经销商:{{ getDealerName(WarehouseInfo.warehouse.dealer) }} </span>
+       </div>
+        <div class="cell clearfix" style="margin-top: 10px">
+          <el-button size="small" icon="el-icon-edit" @click="editRecord"
+            >编辑</el-button
+          >
+          <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
+            >删除</el-button
+          >
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="WarehouseInfo.warehouseInfoDate"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>商品类型</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.good_type_id != 0">{{
+                getTypeName(scope.row.good_type_id)
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.good_id != 0">{{
+                getSpecificationName(scope.row.good_id)
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.price }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>入库数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.warehousing_count }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" min-width="25">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.number }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期" min-width="40" align="center">
+            <template v-if="scope.row.product_date != 0" slot-scope="scope">
+              {{ scope.row.product_date }}
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" min-width="40" align="center">
+            <template v-if="scope.row.expiry_date != 0" slot-scope="scope">
+              {{ scope.row.expiry_date  }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-popover placement="top-start" width="250" trigger="hover">
+                <div>{{ scope.row.remark }}</div>
+                <span slot="reference" v-if="scope.row.remark.length > 20">{{
+                  scope.row.remark.substr(0, 20) + "..."
+                }}</span>
+                <span slot="reference" v-else>{{ scope.row.remark }}</span>
+              </el-popover>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+      </div>
+
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+    <el-dialog
+      title="新增"
+      :visible.sync="editDialogVisible"
+      width="80%"
+    >
+      <span>
+       
+        <div style="margin-bottom:10px">
+          <label class="title"><span class="name">入库时间</span> : </label>
+          <el-date-picker size="small" v-model="warehousing_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"></el-date-picker>
+        </div>
+
+          <div style="margin-bottom:10px">
+            <label class="title"><span class="name">经 销 商</span> : </label>
+            <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+              <el-option
+                v-for="(option, index) in dealer"
+                :key="index"
+                :label="option.dealer_name"
+                :value="option.id">
+              </el-option>
+            </el-select>
+          </div>
+
+          <div style="margin-bottom:10px">
+            <label class="title"><span class="name">厂商</span> : </label>
+
+            <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
+                      @change="changeManufacturer">
+              <el-option
+                v-for="(option, index) in manufacturer"
+                :key="index"
+                :label="option.manufacturer_name"
+                :value="option.id">
+              </el-option>
+            </el-select>
+          </div>
+
+         <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table
+          id="oictable"
+          :data="recordInfo.recordData"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          max-height="450"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>商品类型<span style="color: red">*</span></span>
+            </template>
+
+            <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)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <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)"
+                  @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 align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <span>入库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--{{scope.row.warehousing_count}}-->
+              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.warehousing_count'"
+                :rules="tableRules.warehousing_count"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入入库数量"
+                  type="number"
+                  v-model="scope.row.warehousing_count"
+                ></el-input>
+              </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.warehousing_count) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item>
+                <el-input
+                  placeholder="请输入批号"
+                  v-model="scope.row.number"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="生产日期" width="250" align="center">
+            <template slot-scope="scope">
+            
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" width="250" align="center">
+            <template slot-scope="scope">
+             
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.expiry_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" width="150" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="操作"
+            fixed="right"
+            align="center"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="新增"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEditTwo(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="DeleteWarehouseInfoItem(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="editDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit()">保 存</el-button>
+      </span>
+    </el-dialog>
+
+
+     <stock-in-dialog
+        ref="dialog"
+        :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle">
+    </stock-in-dialog>
   </div>
 </template>
 
 <script>
+import stockInDialog from "./Dialog/stockInDialog";
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
 import {
@@ -182,43 +557,19 @@ import {
   GetAllGoodInfo,
   GetAllGoodType,
   getWarehouseInfoList,
-  getWarehouseList
+  getWarehouseList,
+  DeleteWarehouseInfoItem,
+  GetAllGoodInfoByID,
+  EditWarehouse
 } from "@/api/stock";
+
+import { GetAllDrugInfoByID,postDrugWarehouse} from "@/api/drug/drug_stock";
 import BreadCrumb from "../components/bread-crumb";
 
 export default {
   name: "stockIn",
-  components: { BreadCrumb },
+  components: { BreadCrumb, stockInDialog },
   created() {
-    // var nowDate = new Date();
-    //
-    // var year = new Date().getFullYear()
-    // var month = new Date().getMonth() + 1
-    // var day = nowDate.getDate()
-    // if (parseInt(month) < 10) {
-    //   month = '0' + month
-    // }
-    // if (parseInt(day) < 10) {
-    //   day = '0' + day
-    // }
-    // const endTime = year + '-' + month + '-' + day
-    // this.end_time = endTime
-    //
-    //
-    // var year = new Date().getFullYear()
-    // var month = new Date().getMonth()
-    // var day = new Date().getDate()
-    //
-    // day.setMonth(day.getMonth() - 3);
-    //
-    // if (parseInt(month) < 10) {
-    //   month = '0' + month
-    // }
-    // if (parseInt(day) < 10) {
-    //   day = '0' + day
-    // }
-    // const startTime = year + '-' + month + '-' + day
-    // this.start_time = startTime
 
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
@@ -231,21 +582,38 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
+  
     this.start_time =
       nowYear +
       "-" +
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+   
 
+      this.warehousing_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+
+    
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
+    this.GetAllGoodType()
+    this.GetAllGoodInfo()
   },
   data() {
+
+    var checkGoodId = (rule, value, callback) => {
+      setTimeout(() => {
+        if (value == "" || value == 0) {
+          return callback(new Error("规格名称不能为空"));
+        }
+      }, 2000);
+    };
     return {
       crumbs: [
         { path: false, name: "库存管理" },
@@ -277,10 +645,62 @@ export default {
 
       WarehouseInfo: {
         loading: false,
-        warehouseInfoDate: []
+        warehouseInfoDate: [],
+        warehouse: {}
+      },
+      startTime: "",
+      dialogVisible:false,
+      editDialogVisible:false,
+
+      recordInfo: {
+        recordData: [],
+        stock_in_code: "",
+        current_index: ""
+      },
+
+      tableRules: {
+        price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
+        warehousing_count: [
+          { required: true, message: "数量不能为空", trigge: "blur" }
+        ],
+
+        good_id: [{ validator: checkGoodId, trigger: "blur" }]
+      },
+
+      form: {
+        manufacturer: '',
+        dealer: ''
+      },
+      dealer: [],
+      goodType: [],
+      goodInfo:[],
+      warehousing_time: '',
+
+      propForm: {
+        goods: [],
+        goodType: [],
+        goodInfo: [],
+        goodUnit: [],
+        title: '入库',
+        formValue: {
+        good_type_id: '',
+        good_id: '',
+        number: '',
+        product_date: '',
+        expiry_date: '',
+        warehousing_count: '',
+        price: '',
+        remark: '',
+        dealer: '',
+        manufacturer: ''
+      },
+        isCreated: 1,
+        isVisibility: false,
+        drug_id:1
       },
-      startTime: ""
     };
+
+  
   },
   methods: {
     search: function() {
@@ -349,9 +769,7 @@ export default {
         } else {
           this.WarehouseInfo.loading = false;
           for (let i = 0; i < response.data.data.info.length; i++) {
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
           }
         }
       });
@@ -425,6 +843,7 @@ export default {
           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]);
           }
@@ -437,7 +856,9 @@ export default {
           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]);
           }
         }
@@ -502,6 +923,13 @@ export default {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
+    getTime(val, temp) {
+      if (val != 0) {
+        return uParseTime(val, temp);
+      } else {
+        return "";
+      }
+    },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },
@@ -513,6 +941,9 @@ export default {
         } else {
           this.manufacturer = response.data.data.manufacturer;
           this.dealer = response.data.data.dealer;
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+         
         }
       });
     },
@@ -544,7 +975,7 @@ export default {
       const params = {
         ids: idStr
       };
-
+     
       this.$confirm("确认删除入库单记录?", "删除入库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -626,7 +1057,302 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+
+    handleSearch(id){
+      this.GetOrderDetail(id)
+      this.drug_id = id
+      this.dialogVisible = true
+    },
+
+    GetOrderDetail: function(id) {
+      const params = {
+        id: id
+      };
+      getWarehouseInfoList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+         
+          for (let i = 0; i < response.data.data.info.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
+            response.data.data.info[i].product_date = this.getTime(
+              response.data.data.info[i].product_date,
+              "{y}-{m}-{d}"
+            );
+            response.data.data.info[i].expiry_date = this.getTime(
+              response.data.data.info[i].expiry_date,
+              "{y}-{m}-{d}"
+            );
+           response.data.data.info[i].price = response.data.data.info[i].price.toString();
+           response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
+
+            this.recordInfo.recordData.push(response.data.data.info[i]);
+          }
+          this.WarehouseInfo.warehouse = response.data.data.warehousing;
+         
+        }
+      });
+    },
+
+     editRecord: function() {
+     
+     
+      this.editDialogVisible = true
+    },
+
+     deleteRecord: function() {
+      const ids = [];
+      ids.push(this.WarehouseInfo.warehouse.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除入库单记录?", "删除入库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+
+              this.$router.back(-1);
+            }
+          });
+        })
+        .catch(() => {});
+    },
+
+     typeName: function(good_type_id) {
+     
+      let name = "";
+      for (let i = 0; i < this.goodType.length; i++) {
+        if (this.goodType[i].id == good_type_id) {
+          name = this.goodType[i].type_name;
+        }
+      }
+      return name;
+    },
+
+    showDialog(index, row) {
+      this.currentIndex = index;
+      const params = {
+        manufacturer_id: this.form.manufacturer,
+        dealer_id: this.form.dealer
+      };
+      this.propForm.goods = []
+
+      GetAllGoodInfoByID(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          if (response.data.data.goodInfo.length <= 0) {
+            this.$message.error("该厂商或经销商没有物品信息");
+            return;
+          }
+          this.$refs.dialog.show();
+          for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+            this.propForm.goodType.push(
+              response.data.data.goodInfo[i].type
+            );
+          }
+          const obj = {};
+          this.propForm.goodType = this.propForm.goodType.reduce(
+            (cur, next) => {
+              obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+              return cur;
+            },
+            []
+          ); // 设置cur默认类型为数组，并且初始值为空的数组
+        }
+
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          let goodInfo = [];
+          let goodObj = {};
+
+          for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+            var respObj = response.data.data.goodInfo[a];
+            respObj["isSelected"] = false;
+            if (respObj.type.id == this.propForm.goodType[i].id) {
+              goodInfo.push(respObj);
+            }
+          }
+          const obj = {};
+          goodInfo = goodInfo.reduce((cur, next) => {
+            obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+            return cur;
+          }, []); // 设置cur默认类型为数组，并且初始值为空的数组
+
+          this.$set(goodObj, this.propForm.goodType[i].id, goodInfo);
+          this.propForm.goods.push(goodObj);
+        }
+      });
+    },
+
+    specificationName: function(drug_id) {
+     
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].specification_name;
+          }
+        }
+        return name;
+    }, 
+
+     submit() {
+     
+      this.$refs["tableForm"].validate(valid => {
+        if (valid) {
+          const array = this.recordInfo.recordData;
+          console.log('array',array)
+          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("规格名称不能为空");
+              return;
+            }
+          }
+
+          const params = {
+            stockIn: this.recordInfo.recordData
+          };
+          EditWarehouse(
+            params,
+            this.warehousing_time,
+            this.drug_id,
+            this.type,
+            this.form.manufacturer,
+            this.form.dealer
+          ).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$message.success("入库成功");
+              this.dialogVisible = false
+              this.editDialogVisible = false
+             
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+
+      changeManufacturer(val) {
+
+      }, 
+      changeDealer(val) {
+
+      },
+
+     DeleteWarehouseInfoItem: function(index, row) {
+      if (row.id == 0) {
+        this.recordInfo.recordData.splice(index, 1);
+      } else {
+        const params = {
+          id: row.id
+        };
+        this.$confirm("确认删除该入库商品信息记录?", "删除入库商品信息记录", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            DeleteWarehouseInfoItem(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false;
+              } else {
+                this.$message.success("删除成功");
+
+                this.recordInfo.recordData.splice(index, 1);
+              }
+            });
+          })
+          .catch(() => {});
+      }
+    },
+    handleEditTwo: function(index, row) {
+      const tempObj = {};
+      tempObj["id"] = 0;
+      tempObj["good_type_id"] = 0;
+      tempObj["good_id"] = 0;
+      tempObj["number"] = "";
+      tempObj["product_date"] = "";
+      tempObj["expiry_date"] = "";
+      tempObj["warehousing_count"] = "";
+      tempObj["price"] = "";
+      tempObj["remark"] = "";
+      tempObj["dealer"] = "";
+      tempObj["manufacturer"] = "";
+      this.recordInfo.recordData.push(tempObj);
+    },
+
+     comfirm: function(val) {
+      this.$refs.dialog.hide();
+      this.propForm.goodType = [];
+      this.propForm.goods = [];
+
+      if (val.selectedGoodInfo.length > 0) {
+        for (let i = val.selectedGoodInfo.length - 1; ; 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
+            ].price = val.selectedGoodInfo[i].buy_price.toString();
+          } else {
+            const tempForm = {};
+            tempForm["id"] = 0;
+            tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
+            tempForm["good_id"] = val.selectedGoodInfo[i].id;
+            tempForm["number"] = "";
+            tempForm["product_date"] = "";
+            tempForm["expiry_date"] = "";
+            tempForm["warehousing_count"] = "";
+            tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
+            tempForm["remark"] = "";
+            tempForm["dealer"] = "";
+            tempForm["manufacturer"] = "";
+            this.recordInfo.recordData.splice(
+              this.currentIndex + 1,
+              0,
+              tempForm
+            );
+          }
+        }
+      }
+
+      this.currentIndex = -1;
+    },
+    cancle: function() {
+      this.$refs.dialog.hide();
+      this.propForm.goods = [];
+
+      this.propForm.goodType = [];
+    },
   }
 };
 </script>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -559,6 +559,7 @@ export default {
       this.$router.go(-1);
     },
     submit() {
+     
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;