自备药出库处理

src/api/data.js

@@ -63,9 +63,6 @@ export function getPrintTemplate() {
   })
 }
 
-
-
-
 export function createDictionaryConfig(params) {
   console.log('params', params)
   return request({
@@ -108,7 +105,6 @@ export function updateDictionaryTemplate(params) {
   })
 }
 
-
 export function createBaseDrugLib(params) {
   return request({
     url: '/api/basedruglib/create',
@@ -117,16 +113,14 @@ export function createBaseDrugLib(params) {
   })
 }
 
-
-export function editBaseDrugLib(params,unit) {
+export function editBaseDrugLib(params, unit) {
   return request({
-    url: '/api/basedruglib/edit?unit='+unit,
+    url: '/api/basedruglib/edit?unit=' + unit,
     method: 'post',
     params: params
   })
 }
 
-
 export function getBaseDrugLib(params) {
   return request({
     url: '/api/basedruglib/get',
@@ -135,8 +129,6 @@ export function getBaseDrugLib(params) {
   })
 }
 
-
-
 export function getBaseDrugLibList(params) {
   return request({
     url: '/api/basedruglib/list',
@@ -145,26 +137,21 @@ export function getBaseDrugLibList(params) {
   })
 }
 
-
-
-
-export function createMedicineInsurancePercent(params,module) {
+export function createMedicineInsurancePercent(params, module) {
   return request({
-    url: '/api/medicineinsurancepercent/create?module='+module,
+    url: '/api/medicineinsurancepercent/create?module=' + module,
     method: 'post',
     data: params
   })
 }
 
-
-export function getMedicineInsurancePercent(type_id,module) {
+export function getMedicineInsurancePercent(type_id, module) {
   return request({
-    url: '/api/medicineinsurancepercent/get?type_id='+type_id+"&module="+module,
-    method: 'get',
+    url: '/api/medicineinsurancepercent/get?type_id=' + type_id + '&module=' + module,
+    method: 'get'
   })
 }
 
-
 export function createDrugUnitSafeguard(params) {
   return request({
     url: '/api/drugunitsafeguard/create',
@@ -173,7 +160,11 @@ export function createDrugUnitSafeguard(params) {
   })
 }
 
-
-
-
+export function deleteDurg(params) {
+  return request({
+    url: '/api/drug/basedruglib',
+    method: 'get',
+    params: params
+  })
+}
 

src/api/dialysis.js

@@ -219,8 +219,6 @@ export function postTreatmentsummary(params) {
 }
 
 export function postAssessmentAfterDislysis(params, data) {
-  console.log('到了没有', data)
-  console.log('params', params)
   return request({
     url: '/api/dialysis/assessmentafterdislysis',
     method: 'Post',

src/api/stock.js

@@ -385,9 +385,9 @@ export function DeleteWarehouseInfoItem(params) {
   })
 }
 
-export function EditWarehouse(params, warehousing_time, id,type,manufacturer_id,dealer_id) {
+export function EditWarehouse(params, warehousing_time, id, type, manufacturer_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,
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -433,9 +433,9 @@ export function deleteSalesReturnInfo(params) {
   })
 }
 
-export function editSalesReturnInfo(params, return_time, id,type,manufacturer_id,dealer_id) {
+export function editSalesReturnInfo(params, return_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -473,9 +473,9 @@ export function getWarehouseOutInfo(params) {
   })
 }
 
-export function editWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id,dealer_id) {
+export function editWarehouseoutInfo(params, warehouse_out_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -489,9 +489,9 @@ export function getCancelStockList(params) {
   })
 }
 
-export function editCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id,dealer_id) {
+export function editCancelStockInfo(params, cancel_stock_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id=" + dealer_id,
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -544,8 +544,6 @@ export function getStockDetail(params) {
   })
 }
 
-
-
 export function getPrintStockGood(params) {
   return request({
     url: '/api/print/stock',
@@ -554,7 +552,6 @@ export function getPrintStockGood(params) {
   })
 }
 
-
 export function getWarehouseOutUser(params) {
   return request({
     url: '/api/warehouseout/user',
@@ -562,3 +559,4 @@ export function getWarehouseOutUser(params) {
     params: params
   })
 }
+

src/xt_pages/data/components/addDrugs.vue

@@ -14,10 +14,10 @@
             <el-form-item label="药品名称 : " prop="drug_name" >
               <el-input v-model="form.drug_name" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="拼音 : " prop="pinyin" >
+            <el-form-item label="拼音 : " >
               <el-input v-model="form.pinyin" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="五笔 : " prop="wubi">
+            <el-form-item label="五笔 : " >
               <el-input v-model="form.wubi" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="药品别名 : " prop="drug_alias">
@@ -407,8 +407,6 @@
 
         rules: {
           drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur'  }],
-          pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-          wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
           drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
           drug_spec: [{ required: true, message: '请填写药品规格',trigger: 'blur' }],
           drug_type: [{ required: true, message: '请填写药品类型',trigger: 'blur' }],

src/xt_pages/data/components/drugs.vue

@@ -78,7 +78,7 @@
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</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>-->
+          <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -121,7 +121,8 @@
     createMedicineInsurancePercent,
     editBaseDrugLib,
     getBaseDrugLib,
-    getBaseDrugLibList
+    getBaseDrugLibList,
+    deleteDurg
   } from '@/api/data'
 
   export default {
@@ -460,7 +461,32 @@
           }
           this.$refs.addDrugs.show(0, this.formValue)
         }
-      }, getList() {
+      }, 
+
+       deleteDurg(id,index){
+         console.log("id",id)
+            this.$confirm('确认删除吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+         }).then(() => {
+              const params = {
+                id:id,
+              }
+            deleteDurg(params).then(response => {
+              if (response.data.state == 1) {
+                  var msg = response.data.data.msg
+                  this.list.splice(index, 1);
+                  this.$message.success("删除成功")
+              } else {
+                  this.$message.error("药品已经出库不能删除")
+              }
+            })
+          })
+          .catch(() => {
+          })
+        },
+      getList() {
         let params = {
           page: this.page,
           limit: this.limit,

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -301,12 +301,6 @@
           good_name: [
             { required: true, message: '请输入耗材名称', trigger: 'blur' }
           ],
-          pinyin: [
-            { required: true, message: '请输入拼音', trigger: 'blur' }
-          ],
-          wubi: [
-            { required: true, message: '请输入五笔', trigger: 'blur' }
-          ],
           good_kind: [
             { required: true, message: '请选择耗材种类', trigger: 'change' }
           ],

src/xt_pages/stock/stockInOrderAdd.vue

@@ -89,7 +89,7 @@
 
           <el-table-column align="center" width="150">
             <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>-->

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -144,7 +144,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>-->

src/xt_pages/stock/stockQuery.vue

@@ -38,12 +38,17 @@
             {{ scope.row.good_code }}
           </template>
         </el-table-column>
-        <el-table-column label="商品类型" align="center">
+        <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.good_name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.type.type_name }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="规格名称" align="center">
+        <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.specification_name }}</span>
           </template>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -25,6 +25,20 @@
           </li>
         </ul>
       </div>
+      
+      <div  class="title"><span class="name">班 次</span> :</div>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == week_time ? 'active' : ''"
+            @click="selectWeekTime(item.id)"
+            v-for="item in weekTimes"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
     </div>
     <el-table
       :row-style="{ color: '#303133' }"
@@ -171,6 +185,13 @@ export default {
       anticoagulants_confit: null,
 
       week_type: "1",
+      week_time:0,
+      weekTimes:[
+        {id:0,name:"全部"},
+        {id:1,name:"上午"},
+        {id:2,name:"下午"},
+        {id:3,name:"晚上"},
+      ],
       weekTitle: ["", "", "", "", "", "", ""],
       weekData: {
         Monday: [],
@@ -195,15 +216,20 @@ export default {
   methods: {
     printAction() {
       this.$router.push({
-        path: "/schedule/remind/print?week_type=" + this.week_type
+        path: "/schedule/remind/print?week_type=" + this.week_type+"&week_time="+this.week_time
       });
     },
-    getScheduleWeekDay(weekType) {
-      getScheduleWeekDay(weekType).then(response => {
+    getScheduleWeekDay() {
+        const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+        }
+        console.log("params------",params)
+      getScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
           this.scheduleData = response.data.data.schdules;
-          //console.log("排班-----", this.scheduleData);
+          console.log("排班-----", this.scheduleData);
         } else {
           this.$message.error("网络错误");
           return false;
@@ -290,11 +316,16 @@ export default {
     },
     selectWeekType(type) {
       this.week_type = type;
-      let params = {
-        week_type: this.week_type
-      };
-      this.getScheduleWeekDay(params);
+      // let params = {
+      //   week_type: this.week_type
+      // };
+      this.getScheduleWeekDay();
     },
+    selectWeekTime(type){
+       this.week_time = type
+       this.getScheduleWeekDay()
+    },
+
     getSchedulesType: function(type) {
       let type_name = "";
       switch (type) {
@@ -401,10 +432,10 @@ export default {
     if (this.week_type == 0) {
       this.week_type = 7;
     }
-    let params = {
-      week_type: this.week_type
-    };
-    this.getScheduleWeekDay(params);
+    // let params = {
+    //   week_type: this.week_type
+    // };
+    this.getScheduleWeekDay();
   }
 };
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -123,10 +123,14 @@
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
+      this.week_time  = this.$route.query.week_time
+      
+      const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+        }
 
-
-
-      getScheduleWeekDay({week_type: this.week_type}).then(rs => {
+      getScheduleWeekDay(params).then(rs => {
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {