11月14日 库存扣减更新

src/xt_pages/role/admin.vue

@@ -44,6 +44,12 @@
           min-width="160"
           align="center"
         ></el-table-column>
+        <el-table-column
+          label="医保医师编码"
+          prop="doctor_number"
+          min-width="160"
+          align="center"
+        ></el-table-column>
         <el-table-column
           label="最后登录IP"
           prop="ip"

src/xt_pages/role/components/AdminInfoForm.vue

@@ -68,6 +68,13 @@
       </el-form-item>
     </el-col>
    </el-row>
+   <el-row :span="24">
+      <el-col :span="8">
+       <el-form-item label="医保医师编码:">
+        <el-input v-model="form.doctor_number"></el-input>
+       </el-form-item>
+    </el-col>
+   </el-row>
   
   <div v-show="show">
    <el-row :span="24">
@@ -343,12 +350,7 @@
 
 
   <el-row :gutter="24">
-    <el-col :span="8">
-       <el-form-item label="医保医师编码:">
-         
-        <el-input v-model="form.doctor_number"></el-input>
-       </el-form-item>
-    </el-col>
+   
      <el-col :span="8">
        <el-form-item label="门诊大病类别:" label-width="130px">
             <el-select v-model="form.outpatient_illnessCategory" placeholder="门诊大病类别">
@@ -1063,8 +1065,6 @@
         })
       },
       changeRole(arr){
-        console.log("arr",arr)
-        console.log("roles",this.roles)
         var varName = []
         for(let i=0;i<this.roles.length;i++){
           for(let j=0;j<arr.length;j++){
@@ -1073,7 +1073,6 @@
              }
           }
         }
-        console.log("33333",varName)
         this.form.role_type = 1
         var ids = varName.join(";")
         console.log("valee22222",ids)

src/xt_pages/stock/cancelStockOrder.vue

@@ -186,6 +186,12 @@
             </template>
           </el-table-column>
 
+           <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              {{scope.row.GoodInfo.social_security_directory_code}}
+            </template>
+          </el-table-column>
+
           <el-table-column label="退库数量" align="center">
             <template slot-scope="scope">
               {{ scope.row.count}}{{scope.row.GoodInfo.packing_unit}}

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -182,7 +182,11 @@
                 {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
               </template>
             </el-table-column>
-          
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.BaseDrugLib.medical_insurance_number}}
+              </template>
+            </el-table-column>
             <el-table-column label="退库数量" align="center">
               <template slot-scope="scope">
                 {{ scope.row.count}}

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -18,6 +18,7 @@
               <td style="line-height: 50px" width="100">药品类型</td>
               <td style="line-height: 50px" width="150">药品名称</td>
               <td style="line-height: 50px" width="150">规格型号&单位</td>
+              <td style="line-height: 50px" width="150">国家编码</td>
               <td style="line-height: 50px" width="100">进货单价</td>
               <td  style="line-height: 50px" width="200">厂家</td>
               <td style="line-height: 50px" width="80">入库数量</td>
@@ -38,7 +39,9 @@
               <td style="line-height: 50px">
                    <span> {{item.dose + item.dose_unit +"*"+item.min_number+item.min_unit+"/"+item.max_unit}}</span>
               </td>
-             
+             <td style="line-height: 50px">
+                  <span>{{item.medical_insurance_number }}</span>
+              </td>
               <td style="line-height: 50px">
                   <span>{{item.last_price }}</span>
               </td>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -189,6 +189,11 @@
           <template slot-scope="scope">
             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
           </template>
+        </el-table-column>
+          <el-table-column label="国家编码" align="center">
+          <template slot-scope="scope">
+            {{scope.row.drug.medical_insurance_number}}
+          </template>
         </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -211,7 +211,11 @@
               {{scope.row.dose}} {{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
             </template>
           </el-table-column>
-         
+          <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              {{scope.row.medical_insurance_number}}
+            </template>
+          </el-table-column>
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <!-- <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span> -->

src/xt_pages/stock/drugs/query.vue

@@ -94,6 +94,11 @@
            <template slot-scope="scope">
              {{scope.row.dose + scope.row.dose_unit +"*"+scope.row.min_number+scope.row.min_unit+"/"+scope.row.max_unit}}
            </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="国家编码" align="center">
+           <template slot-scope="scope">
+             {{scope.row.medical_insurance_number}}
+           </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="进货单价" align="center">
            <template slot-scope="scope">
@@ -482,8 +487,8 @@ import { min } from 'moment'
           }   
          }
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
-         const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
+         const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','国家编码','进货单价','厂家','入库数量','出库数量','剩余库存量']
+         const filterVal = ['index', 'drug_type_name', 'drug_name','unit','medical_insurance_number','last_price','manufacturer_name','inCount','outCount','overplusCount']
 
 
          const data = this.formatJson(filterVal, this.tableList)

src/xt_pages/stock/inventory.vue

@@ -100,7 +100,7 @@
           v-model="form.drug_name"
           :fetch-suggestions="querySearchAsync"
           :trigger-on-focus="true"
-          placeholder="请输入药品名称"
+          placeholder="请输入耗材名称"
           @select="handleSelect"
           style="width:300px;"
           v-show="showTableOne"

src/xt_pages/stock/stockInOrder.vue

@@ -193,6 +193,11 @@
             {{ scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
           </template>
         </el-table-column>
+        <el-table-column label="国家编码" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.GoodInfo.social_security_directory_code}}
+          </template>
+        </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">
             {{ scope.row.number}}
@@ -202,6 +207,11 @@
           <template slot-scope="scope">
             {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
           </template>
+        </el-table-column>
+         <el-table-column label="零售价" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.packing_price}}
+          </template>
         </el-table-column>
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">

src/xt_pages/stock/stockInOrderAdd.vue

@@ -107,7 +107,21 @@
             
             </template>
           </el-table-column>
+        
+          <el-table-column align="center" width="120">
+            <template slot="header" slot-scope="scope">
+              <span>零售价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+            
+              <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
+                            style="padding-top: 20px">
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price"></el-input>
+              </el-form-item>
 
+
+            </template>
+          </el-table-column>
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>进货单价<span style="color: red">*</span></span>
@@ -285,6 +299,9 @@
           price: [
             { required: true, message: '单价不能为空', trigger: 'blur' }
           ],
+          packing_price: [
+            { required: true, message: '零售价不能为空', trigger: 'blur' }
+          ],
           warehousing_count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
           ],
@@ -511,6 +528,7 @@
         tempObj['specification_name'] = ''
         tempObj['name'] = ''
         tempObj['license_number'] = ""
+        tempObj["packing_price"] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -652,6 +670,7 @@
                 return
               }
               array[i].price = array[i].price.toString()
+              array[i].packing_price = array[i].packing_price.toString()
             }
 
             if(this.recordInfo.recordData.length <= 0){
@@ -755,6 +774,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
+         console.log("val3232232323",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].good_type_id = val.id
@@ -764,11 +784,18 @@
               this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
+           
               if(val.buy_price == 0){
                this.recordInfo.recordData[i].price = ""
               }else{
                 this.recordInfo.recordData[i].price = val.buy_price
               }
+
+              if(val.packing_price == 0){
+               this.recordInfo.recordData[i].packing_price = ""
+              }else{
+                this.recordInfo.recordData[i].packing_price = val.packing_price
+              }
               
               this.recordInfo.recordData[i].specification_name = val.specification_name
               this.recordInfo.recordData[i].good_id = val.id
@@ -811,6 +838,7 @@
       tempObj['specification_name'] = ''
       tempObj['name'] = ''
       tempObj['license_number'] = ''
+      tempObj['packing_price']= ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockInOrderEdit.vue

@@ -122,10 +122,23 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column align="center" width="120">
+            <template slot="header" slot-scope="scope">
+              <span>零售价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+            
+              <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
+                            style="padding-top: 20px">
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price"></el-input>
+              </el-form-item>
+
 
+            </template>
+          </el-table-column>
           <el-table-column align="center" width="120">
             <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>-->
@@ -340,6 +353,9 @@ export default {
       },
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
+        packing_price: [
+          { required: true, message: '零售价不能为空', trigger: 'blur' }
+        ],
         warehousing_count: [
           { required: true, message: "数量不能为空", trigge: "blur" }
         ],
@@ -482,6 +498,7 @@ export default {
       tempObj["dealer"] = "";
       tempObj["manufacturer"] = "";
       tempObj["license_number"] = ""
+      tempObj["packing_price"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -608,6 +625,7 @@ export default {
          
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+             this.recordInfo.recordData[i].packing_price = this.recordInfo.recordData[i].packing_price.toString()
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }

src/xt_pages/stock/stockOutOrder.vue

@@ -191,6 +191,12 @@
               {{ scope.row.specification_name}} / {{scope.row.packing_unit}}
             </template>
           </el-table-column>
+
+          <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.social_security_directory_code}}
+            </template>
+          </el-table-column>
          
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">

src/xt_pages/stock/stockPrint.vue

@@ -27,6 +27,7 @@
                                     <td width="80">耗材类型</td>
                                     <td width="80">耗材名称</td>
                                     <td width="80">规格&单位</td>
+                                    <td width="80">国家编码</td>
                                     <td width="80">进货单价</td>
                                     <td width="80">生产商</td>
                                     <td width="80">入库数量</td>
@@ -39,6 +40,7 @@
                                    <td>{{getGoodType(item.good_type_id)}}</td>
                                    <td>{{item.good_name }}</td>
                                    <td><span>{{item.specification_name }} / {{item.packing_unit}}</span></td>
+                                   <td>{{item.social_security_directory_code}}</td>
                                    <td>{{item.buy_price}}</td>
                                    <td>{{getManufacture(item.manufacturer)}}</td>
                                    <td>

src/xt_pages/stock/stockQuery.vue

@@ -91,6 +91,11 @@
               <span>{{ scope.row.specification_name }} / {{scope.row.packing_unit}}</span>
             </template>
          </el-table-column>
+         <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.social_security_directory_code}}</span>
+            </template>
+         </el-table-column>
         <el-table-column label="进货单价" align="center">
           <template slot-scope="scope">
              {{scope.row.buy_price}}
@@ -353,8 +358,8 @@ export default {
     exportList(){
          import('@/vendor/Export2Excel').then(excel => {
 
-         const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
-         const filterVal = ['type_name', 'good_name', 'unit','buy_price','prodect_name','inCount','outCount','overplus']
+         const tHeader = ['耗材类型', '耗材名称', '规格&单位','国家编码','进货单价','生产商','入库数量','出库数量','库存剩余量']
+         const filterVal = ['type_name', 'good_name', 'unit','social_security_directory_code','buy_price','prodect_name','inCount','outCount','overplus']
 
 
          for(let i=0;i<this.tableList.length;i++){

src/xt_pages/workforce/components/tableData.vue

@@ -86,8 +86,37 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="300">
+          
+           <template slot-scope="scope">
+            <span v-if="now_time>scope.row.schedule_date">
+              <el-button
+                size="mini"
+                type="primary"
+                :disable="true"
+              >
+                取消排班
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                :disable="true"
+              >
+                调整机号
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+              :disable="true"
+              >
+                调整模式
+              </el-button>
+           </span>
+          </template>
+         
+         
           <template slot-scope="scope">
-            <el-button
+            <span v-if="now_time <=scope.row.schedule_date">
+              <el-button
               size="mini"
               type="primary"
               @click="CancelSchedule(scope.row.id)"
@@ -108,6 +137,8 @@
             >
               调整模式
             </el-button>
+            </span>
+           
           </template>
         </el-table-column>
       </el-table>
@@ -774,7 +805,8 @@ export default {
       },
       zoneIdList:[],
       strArr:"",
-      patient_id_hover:0
+      patient_id_hover:0,
+      now_time:"",
     };
   },
 
@@ -2307,7 +2339,21 @@ export default {
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
   // },
   created() {
-    
+    var date = new Date()
+    this.time = date
+    var year = date.getFullYear()
+    var month = date.getMonth() + 1
+    if (month < 10) {
+      month = "0" + month
+    }
+    var day = date.getDate()
+    if (day < 10) {
+      day = "0" + day
+    }
+    var nowDate = year + "-" + month + "-" + day
+    var date = new Date(nowDate + " 00:00:00")
+    console.log("date23232323232323",date.getTime()/1000) 
+    this.now_time = date.getTime()/1000
     this.getAllZones()
  
     this.changeScheduleType(1)