Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/store/modules/globalConfig.js

@@ -220,11 +220,11 @@ const global_config = {
       }
     ],
     contagions: [ // 传染病
-      {
-        id: 1,
-        name: '普通',
-        type: 1
-      },
+      // {
+      //   id: 1,
+      //   name: '普通',
+      //   type: 1
+      // },
       {
         id: 2,
         name: '乙肝',

src/xt_pages/data/components/addDrugs.vue

@@ -20,6 +20,11 @@
                                       maxlength="30"></el-input>
                         </el-form-item>
 
+                        <!-- <el-form-item label="药品规格 : ">
+                            <el-input v-model="form.specification_name" style="width:160px;" placeholder=""
+                                      maxlength="30"></el-input>
+                        </el-form-item> -->
+
                         <el-form-item label="药品类别 : " prop="drug_category">
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -145,7 +150,7 @@
                         <el-input v-model="form.drug_day" style="width:160px;" placeholder=""
                                   maxlength="30"></el-input>
                     </el-form-item>
-                       <el-form-item label="库存警戒:" prop="drug_stock_limit">
+                       <el-form-item label="库存警戒:">
                             <el-input v-model="form.drug_stock_limit" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -836,7 +836,8 @@
         current_drug_name:"",
         current_drug_spec: "",
         drug_id: 0,
-        src_type:""
+        src_type:"",
+        org_id:0,
       }
     },
     watch: {
@@ -2172,8 +2173,11 @@
         let tempPrescribingNumberDesc = ''
 
         if (row.prescribing_number) {
-          tempPrescribingNumberDesc =
-            row.prescribing_number + '' + row.prescribing_number_unit
+           tempPrescribingNumberDesc = row.prescribing_number + '' + row.prescribing_number_unit
+        }
+
+        if(this.org_id == 10188 ){
+            tempPrescribingNumberDesc = ""
         }
 
         if (row.single_dose) {
@@ -2548,6 +2552,7 @@
       this.getAdviceConfig()
       this.unitsOption = getDataConfig('hemodialysis', 'units')
       this.template_id = this.$store.getters.xt_user.template_info.template_id
+      this.org_id = this.$store.getters.xt_user.org.id
       this.patientid = this.$route.query.patient_id
       this.request_record_date = this.record_date
 

src/xt_pages/stock/drugs/query.vue

@@ -79,11 +79,7 @@
       </div>
       
        <el-table :data="tableList" border style="width: 100%">
-        <!-- <el-table-column prop="date" label="药品编号" width="180">
-           <template  slot-scope="scope">
-              
-           </template>
-        </el-table-column> -->
+      
         <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
            <template slot-scope="scope">
              {{getDrugType(scope.row.drug_type)}}
@@ -116,15 +112,15 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-              <span v-if="org_id == 10028 || org_id == 9671">{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}</span>
-              <span v-else>{{getWarehouseOutInfo(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+              <span>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
+              <!-- <span v-else>{{getWarehouseOutInfo(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>  -->
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span v-if="(org_id == 10028 || org_id == 9671)">{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}} </span>
-               <span v-else>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+               <span>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
+               <!-- <span v-else>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>  -->
             </div>
            </template>
         </el-table-column>
@@ -178,16 +174,6 @@ import { min } from 'moment'
     name: 'stockIn',
     created() {
       
-      // var nowDate = new Date();
-      // var nowYear = nowDate.getFullYear();
-      // var nowMonth = nowDate.getMonth() + 1;
-      // var nowDay = nowDate.getDate();
-      // this.end_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(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.getlist()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
@@ -524,8 +510,6 @@ import { min } from 'moment'
          console.log("paramsw2ww",params)
         getDrugCountList(params).then(response=>{
           if(response.data.state == 1){
-            var countlist =  response.data.data.countList
-            this.countList = countlist
             var minCount = response.data.data.minCount
             console.log("minCount",minCount)
             this.minCount = minCount
@@ -537,6 +521,7 @@ import { min } from 'moment'
                  info[i].count = info[i].count * info[i].min_number
               }
             }
+
             this.outCountList = response.data.data.outCountList
             console.log("手动出库",this.outCountList)
             this.auCountList = response.data.data.auCountList

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -391,7 +391,7 @@ export default {
               }
             }
             var arr =   newList.sort(this.compare('sort'))
-            // console.log("元旦快乐",arr)
+            console.log("元旦快乐",arr)
             this.scheduleData = arr
           }
 

src/xt_pages/workforce/components/tableData.vue

@@ -818,8 +818,9 @@ export default {
             return false
           }
           var partitions = response.data.data.partitions
-        
+          console.log("partitions",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
+          console.log("这个周",response.data.data.theWeek)
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
@@ -840,6 +841,7 @@ export default {
                   zone_type: partition.type,
                   cut: jihao.number,
                   jihao_id: jihao.id,
+                  sort:jihao.sort,
                   Mon_M: {
                     schedule_id: 0,
                     mode_id: 0,