518合并代码

src/xt_pages/data/basicConfig.vue

@@ -39,9 +39,9 @@
             <p style="margin-top:20px;">耗材先出库再执行：
                 <el-switch v-model="is_open_is_type" @change="changeFuncType"></el-switch>
             </p>
-            <p style="margin-top:20px;">药品在保存处方时出库：
+            <!-- <p style="margin-top:20px;">药品在保存处方时出库：
                 <el-switch v-model="drug_out_open" @change="changeDrugOpen"></el-switch>
-            </p>
+            </p> -->
         </div>
 
 

src/xt_pages/data/components/drugs.vue

@@ -120,7 +120,7 @@
       </el-table-column>
       <el-table-column prop="date" label="批准文号" width="100" align="center">
         <template slot-scope="scope">
-          <div></div>
+          <div>{{scope.row.number}}</div>
         </template>
       </el-table-column>
       <el-table-column prop="date" label="药品本位码" width="100" align="center">

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -714,6 +714,9 @@ export default {
         case 2:
           return 'ml'
           break
+        case 3:
+          return 'kg'
+          break
       }
     },
     getSealingFluidDisposeName: function(id) {

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

@@ -690,7 +690,7 @@ export default {
       symptomsOptions: [],
       internalFistulaOptions: [],
       vascularAccessOptions: [],
-      unit: [{ id: 1, name: 'g' }, { id: 2, name: 'ml' }],
+      unit: [{ id: 1, name: 'g' }, { id: 2, name: 'ml' },{ id: 3, name: 'kg' }],
       actualTreatmentHourShow: '',
       vascularAccessDescOptions: [],
       catheterOptions: [],

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -8,15 +8,15 @@
       type="primary"
       >打印
     </el-button>
-    <el-button
-      style="float: right; margin-right: 10px"
+     <el-button
+      style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetai"
       type="primary"
       >明细导出
     </el-button>
-    <el-button
-      style="float: right; margin-right: 10px"
+     <el-button
+      style="float: right;margin-right:10px"
       size="small"
       @click="exportList"
       type="primary"
@@ -24,26 +24,18 @@
     </el-button>
 
     <div class="cell clearfix">
-      <label class="title"><span class="name">仓库</span> :</label>
-      <el-select
-        size="small"
-        v-model="storehouse_id"
-        filterable
-        placeholder="请选择仓库"
-        style="width: 200px"
-        @change="changeHouseList"
-      >
-        <el-option
-          v-for="(option, index) in houseList"
-          :key="index"
-          :label="option.storehouse_name"
-          :value="option.id"
-        >
-        </el-option>
+       <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
       </el-select>
       <el-input
         size="small"
-        style="width: 200px"
+        style="width: 200px;"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/药品名称"
@@ -56,36 +48,38 @@
         @click="search"
         >搜索</el-button
       >
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 150px"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <el-date-picker
-        size="small"
-        v-model="end_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 150px"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="endTimeChange"
-      ></el-date-picker>
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 150px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 150px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+
     </div>
 
+
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="tableData"
@@ -97,7 +91,7 @@
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266',
+          color: '#606266'
         }"
       >
         <el-table-column label="单据编号" align="center" width="200">
@@ -115,73 +109,66 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="药品名称" align="center">
+         <el-table-column label="药品名称" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug_name }}
+            {{scope.row.drug_name}}
           </template>
         </el-table-column>
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
-            <!-- {{scope.row.drug_spec}} -->
-            {{ scope.row.specification_name }}
+           <!-- {{scope.row.drug_spec}} -->
+           {{scope.row.specification_name}}
           </template>
         </el-table-column>
 
+
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
-            <span>{{ getTime(scope.row.ctime) }}</span>
+           <span>{{getTime(scope.row.ctime)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
-            {{ getAdminUser(scope.row.creater) }}
+           {{getAdminUser(scope.row.creater)}}
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            {{ getStorehouseName(scope.row.storehouse_id) }}
+           {{getStorehouseName(scope.row.storehouse_id)}}
           </template>
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-            <span v-if="org_id == 9919">{{ scope.row.last_price }} </span>
-            <span v-else>
-              <span v-if="scope.row.price > 0"> {{ scope.row.price }}</span>
-              <span v-if="scope.row.price == 0">
-                {{ getPrice(scope.row.drug_id) }}</span
-              >
-            </span>
+           <span v-if="org_id == 9919">{{scope.row.last_price}} </span>
+           <span v-else>
+             <span v-if="scope.row.price >0"> {{scope.row.price}}</span>
+            <span v-if="scope.row.price  == 0"> {{getPrice(scope.row.drug_id)}}</span>
+           </span>
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.count }}
+            {{scope.row.count}}
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center">
+         <el-table-column label="单位" align="center">
           <template slot-scope="scope">
-            {{ scope.row.count_unit }}
+            {{scope.row.count_unit}}
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.is_total != 1">
-              <span v-if="org_id == 9919"
-                >{{ (scope.row.last_price * scope.row.count).toFixed(2) }}
-              </span>
-              <span v-if="org_id == 10210"
-                >{{ (scope.row.price * scope.row.count).toFixed(2) }}
-              </span>
-              <span v-if="org_id == 9671"
-                >{{ (scope.row.price * scope.row.count).toFixed(2) }}
-              </span>
-              <span v-if="org_id != 9919 && org_id != 10210 && org_id != 9671">
-                {{ scope.row.total_price }}
-              </span>
+            <span v-if="scope.row.is_total !=1">
+              <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span>
+              <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
+              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
+              <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
+                 {{scope.row.total_price}}
+               </span>
             </span>
             <span v-if="scope.row.is_total == 1">
-              {{ scope.row.total_price }}
+              {{scope.row.total_price}}
             </span>
           </template>
         </el-table-column>
@@ -190,10 +177,10 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100, 1000]"
+        :page-sizes="[10, 50, 100,1000]"
         :page-size="10"
         background
-        style="margin-top: 20px; float: right"
+        style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
@@ -476,8 +463,11 @@ export default {
                 }
                 total_price +=order[i].total_price
                }
+
              }
+
           }
+           console.log("toal_p3232332332233232",total_price)
            order.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
@@ -489,6 +479,8 @@ export default {
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
+
+          console.log("233223322323322332232323",order)
           this.tableData = order
 
            let objInfo = {}
@@ -542,6 +534,8 @@ export default {
               }
             })
           }
+
+
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].child.length;j++){
               if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
@@ -557,8 +551,8 @@ export default {
           this.tableList = list
           var total = response.data.data.total
           this.total = total
-          }}
-  )}
+        }
+      })
     },
 
    select(){
@@ -882,7 +876,7 @@ export default {
        this.houseList = []
        this.getlist()
      }
-  
+  }
 };
 </script>
 

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -27,7 +27,7 @@
                 >
             </div>
             <div>
-               <el-button size="small" type="primary" @click="print_1">打印</el-button>
+               <!-- <el-button size="small" type="primary" @click="print_1">打印</el-button> -->
                <el-button size="small" type="primary" @click="print">盘点模版打印</el-button>
             </div>
             <!-- <div>

src/xt_pages/stock/inventoryDetails.vue

@@ -26,7 +26,7 @@
                 @click="search">搜索</el-button>
             </div>
             <div>
-              <el-button type="primary" @click="toprint">打印</el-button>
+              <!-- <el-button type="primary" @click="toprint">打印</el-button> -->
               <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
             </div>
             <!-- <div>

src/xt_pages/stock/stockOutOrder.vue

@@ -110,8 +110,6 @@
           >导出</el-button
         >
         <span>&nbsp;&nbsp;</span>
-        <!-- <el-button size="small" type="primary" @click="toExport">导出</el-button> -->
-        <!-- <span>&nbsp;&nbsp;</span> -->
         <label class="title"><span class="name">出库方式</span> :</label>
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
             <el-option
@@ -122,23 +120,16 @@
             </el-option>
         </el-select> 
 
-        <div style="margin-left: 10px">
-          <span>审核状态:</span>
-          <el-select
-            v-model="check_type"
-            style="width: 140px; margin-right: 10px"
-            placeholder="请选择"
-            @change="changeCheckList"
-          >
-            <el-option
-              v-for="item in checkList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
+       <span>&nbsp;&nbsp;</span>
+          <label class="title"><span class="name">审核状态</span> :</label>
+          <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
+              <el-option
+                v-for="(option, index) in checkList"
+                :key="index"
+                :label="option.name"
+                :value="option.id">
+              </el-option>
           </el-select>
-        </div>
       </div>
 
       <el-table
@@ -191,7 +182,7 @@
           </template>
         </el-table-column>
 
-       <el-table-column label="审核状态" align="center">
+        <el-table-column label="审核状态" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_check == 1">已审核</span>
             <span v-if="scope.row.is_check == 2">未审核</span>
@@ -872,7 +863,6 @@
     >
     </stock-in-dialog>
   </div>
-  </div>
 </template>
 
 <script>
@@ -1046,7 +1036,6 @@ export default {
         keyword: this.keywords,
         page: this.page,
         limit: this.limit,
-        check_type:this.check_type,
       };
       getAllSecondOrderList(params).then((response) => {
         if (response.data.state == 1) {
@@ -1234,7 +1223,7 @@ export default {
           row.is_sys +
           "&supply_cancel_out_id=" +
           row.supply_cancel_out_id+
-          "&is_check="+row.is_check+"&type="+row.type,
+          "&type="+row.type+"&is_check="+row.is_check,
       });
     },
     handleDelete: function (index, row) {
@@ -1328,10 +1317,10 @@ export default {
         }
         if (this.selectedTableData[i].is_sys == 0) {
           ids.push(this.selectedTableData[i].id);
-          if(this.selectedTableData[i].supply_cancel_out_id > 0){
+          if(this.selectedTableData[i].supply_cancel_out_id >0){
             idOne.push(this.selectedTableData[i].supply_cancel_out_id);
           }
-        
+          
         }
       }
       if (idOne.length > 0) {
@@ -1369,8 +1358,8 @@ export default {
               }
             }
           });
-      })
-        .catch(() => {})}
+        })
+        .catch(() => {});
     },
 
     handleSearch(val) {
@@ -2039,10 +2028,10 @@ export default {
     changeWay() {
       this.GetWarehouseOut();
     },
-    changeCheckList(){
-      this.GetWarehouseOut();
+    changeCheckType(){
+      this.GetWarehouseOut()
     }
-  
+  },
 };
 </script>