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

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -475,7 +475,7 @@
       },
       getPrescribingNumberUnit(scope) {
 
-        // console.log('scope',scope)
+        console.log('scope9999999',scope)
         // if(scope.row.drug.min_unit == scope.row.single_dose_unit){
         //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
@@ -494,13 +494,13 @@
         // }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           scope.row.retail_price = scope.row.drug.min_price
-          if (scope.row.prescribing_number > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+          // if (scope.row.prescribing_number > scope.row.drug.total) {
+          //   this.$message.error(scope.row.drug_name + '库存不足')
+          // }
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+          // if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+          //   this.$message.error(scope.row.drug_name + '库存不足')
+          // }
           scope.row.retail_price = scope.row.drug.retail_price
         }
       },

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2658,7 +2658,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2933,7 +2933,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 ){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 ){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -463,7 +463,7 @@
       },
       getPrescribingNumberUnit(scope) {
 
-        // console.log('scope',scope)
+         console.log('scope',scope)
         // if(scope.row.drug.min_unit == scope.row.single_dose_unit){
         //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
@@ -482,13 +482,13 @@
         // }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           scope.row.retail_price = scope.row.drug.min_price
-          if (scope.row.prescribing_number > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+          // if (scope.row.prescribing_number > scope.row.drug.total) {
+          //   this.$message.error(scope.row.drug_name + '库存不足')
+          // }
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+          // if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+          //   this.$message.error(scope.row.drug_name + '库存不足')
+          // }
           scope.row.retail_price = scope.row.drug.retail_price
         }
       },

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -29,6 +29,7 @@
               <td style="line-height:18px;" width="80">批号</td>
               <td style="line-height:18px;" width="120">生产日期</td>
               <td style="line-height:18px;" width="120">有效日期</td>
+              <td style="line-height:18px;" width="120">入库日期</td>
               <td style="line-height:18px;" width="60">质检<br>意见</td>
               <td style="line-height:18px;" width="60">验收<br>结论</td>
             </tr>
@@ -57,6 +58,7 @@
               <td style="line-height:18px">{{ item.batch_number }}</td>
               <td style="line-height:18px">{{ getTime(item.product_date,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">{{ getTime(item.expiry_date,'{y}-{m}-{d}')}}</td>
+              <td style="line-height:18px">{{ getTime(it.ctime,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">正常<br>入库</td>
               <td style="line-height:18px">合格</td>
             </tr>

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -139,7 +139,7 @@ export default {
               page:this.page,
               keyword:this.searchKey,
             }
-           console.log("parasm232332323",params)
+        
           getInventoryDetailList(params).then(response=>{
              if(response.data.state == 1){
               this.total =  response.data.data.total
@@ -150,7 +150,7 @@ export default {
           })   
         },
          getTime(val) {
-          console.log("val3233232322323",val)
+         
          if(val == undefined){
            return  ""
          }

src/xt_pages/stock/inventoryDetails.vue

@@ -53,8 +53,8 @@
            
             <el-table-column prop="name" label="盘盈类型"  width="100" align="center">
                 <template slot-scope="scope">
-                   <span v-if="scope.row.count > scope.row.last_stock_count">盘盈</span>
-                   <span v-if="scope.row.count < scope.row.last_stock_count">盘亏</span>
+                   <span v-if="scope.row.stock_count > scope.row.last_stock_count">盘亏</span>
+                   <span v-if="scope.row.stock_count < scope.row.last_stock_count">盘盈</span>
                 </template>
             </el-table-column>
            

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -39,6 +39,7 @@
                                     <td style="line-height:18px;" width="80">批号</td>
                                     <td style="line-height:18px;" width="120">生产日期</td>
                                     <td style="line-height:18px;" width="120">有效日期</td>
+                                    <td style="line-height:18px;" width="120">入库日期</td>
                                     <td style="line-height:18px;" width="60">质检<br>意见</td>
                                     <td style="line-height:18px;" width="60">验收<br>结论</td>
                                 </tr>
@@ -56,6 +57,7 @@
                                     <td style="line-height:18px;">{{ item.number }}</td>
                                     <td style="line-height:18px;">{{ getTime(item.product_date) }}</td>
                                     <td style="line-height:18px;">{{ getTime(item.expiry_date) }}</td>
+                                    <td style="line-height:18px;">{{ getTime(item.ctime) }}</td>
                                     <td style="line-height:18px;">正常<br>入库</td>
                                     <td style="line-height:18px;">合格</td>
                                 </tr>