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

src/xt_pages/outpatientTool/labelPrint.vue

@@ -105,7 +105,7 @@
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
                           </div>
-                          <img style="width:300px;height:80px;margin-left:10px;" id="barcode">
+                          <img style="width:300px;height:200px;margin-left:10px;" id="barcode">
                       </div>
                       <div style="margin-bottom:5px;">{{current_number}}</div>
                       <div style="display:flex;">
@@ -193,15 +193,21 @@
         this.current_number = row.number
         this.current_project_name = row.project_name
         this.current_name = row.patient_name
-
         this.$nextTick(() => {
-          JsBarcode('#barcode', 'DY2020080400088', {
+          JsBarcode('#barcode',row.feedetl_sn, {
             format: 'CODE39',
             lineColor: '#000',
             background: '#EBEEF5',
-            width: 2,
-            height: 100,
-            displayValue: false
+            width: 3,
+            height: 200,
+            displayValue: false,
+            fontOptions:"bold italic",//使文字加粗体或变斜体
+            font:"fantasy",//设置文本的字体
+            textAlign:"left",//设置文本的水平对齐方式
+            textPosition:"top",//设置文本的垂直位置
+            textMargin:5,//设置条形码和文本之间的间距
+            fontSize:15,//设置文本的大小
+            margin:15//设置条形码周围的空白边距
           })
 
         });

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -1,90 +1,86 @@
 <template>
-  <div class="main-contain">
-    <div class="app-container">
-        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
-            <div>
-                <el-input
-                size="small"
-                style="width: 200px;"
-                class="filter-item"
-                v-model.trim="searchKey"
-                placeholder="请输入药品名称"
-                />
-                <el-button
-                size="small"
-                class="filter-item"
-                type="primary"
-                icon="el-icon-search"
-                @click="search"
-                >搜索</el-button
-                >
-                <el-date-picker
-                size="small"
-                v-model="start_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期"
-                @change="changeStartTime">
-                </el-date-picker>
-                <el-date-picker
-                size="small"
-                v-model="end_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期"
-                @change="changeEndTime">
-                </el-date-picker>
-            </div> 
-        </div>
-        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" >
-            <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column  prop="date" label="报损日期" align="center">
-               <template slot-scope="scope">
-                  {{getTime(scope.row.start_time)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="药品名称" align="center">
-               <template slot-scope="scope">
-                  {{scope.row.drug_name}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="规格" align="center">
-               <template slot-scope="scope">
-                  {{scope.row.specification_name}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="总报损数量" align="center">
-               <template slot-scope="scope">
-                  {{getTotalCount(scope.row.drug_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="总报损金额" align="center">
-               <template slot-scope="scope">
-                  {{getTotalPrice(scope.row.drug_id,scope.row.min_price)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="操作人" align="center">
-               <template slot-scope="scope">
-                  {{getDoctorName(scope.row.creater)}}
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="200">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="clickDetai(scope.row.drug_id)">查看详情</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[10, 20, 40, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;text-align: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-        </el-pagination>
-    </div>
+  <div>
+    <div  style="margin-bottom:10px;">
+      <el-input
+      size="small"
+      style="width: 200px;"
+      class="filter-item"
+      v-model.trim="searchKey"
+      placeholder="请输入药品名称"
+      />
+      <el-button
+      size="small"
+      class="filter-item"
+      type="primary"
+      icon="el-icon-search"
+      @click="search"
+      >搜索</el-button
+      >
+      <el-date-picker
+      size="small"
+      v-model="start_time"
+      type="date"
+      style="margin-left:5px;width:140px;"
+      placeholder="选择日期"
+      @change="changeStartTime">
+      </el-date-picker>
+      <el-date-picker
+      size="small"
+      v-model="end_time"
+      type="date"
+      style="margin-left:5px;width:140px;"
+      placeholder="选择日期"
+      @change="changeEndTime">
+      </el-date-picker>
+    </div> 
+    <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" >
+        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <el-table-column  prop="date" label="报损日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.start_time)}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="药品名称" align="center">
+            <template slot-scope="scope">
+              {{scope.row.drug_name}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="规格" align="center">
+            <template slot-scope="scope">
+              {{scope.row.specification_name}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="总报损数量" align="center">
+            <template slot-scope="scope">
+              {{getTotalCount(scope.row.drug_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="总报损金额" align="center">
+            <template slot-scope="scope">
+              {{getTotalPrice(scope.row.drug_id,scope.row.min_price)}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="操作人" align="center">
+            <template slot-scope="scope">
+              {{getDoctorName(scope.row.creater)}}
+            </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200">
+            <template slot-scope="scope">
+              <el-button type="primary" size="small" @click="clickDetai(scope.row.drug_id)">查看详情</el-button>
+            </template>
+        </el-table-column>
+    </el-table>
+    <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 40, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;text-align: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+    </el-pagination>
 
     <el-dialog
       title="盘点批次详情"
@@ -93,10 +89,12 @@
       <span>
         <el-form>
           <el-row>
-            <el-col>
+            <el-col :span="8">
               <el-form-item label="入库单号:">
                  <el-input v-model ="form.warehouseing_order" style="width:200px"></el-input>
               </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-form-item label="原因:">
                   <el-select v-model="form.type" placeholder="请选择">
                       <el-option
@@ -107,11 +105,13 @@
                       </el-option>
                   </el-select>
               </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-button type="primary" @click="toQuery">查询</el-button>
             </el-col>
           </el-row>
-          <el-row>
-            <div>&nbsp;&nbsp;{{drug_name}}  &nbsp;&nbsp;总损耗数量: {{getDamagedCount(total_count)}}    &nbsp;&nbsp;总报损金额:{{(total_count * min_price).toFixed(2)}}</div>
+          <el-row style="margin-bottom:10px;">
+            <div>{{drug_name}}  &nbsp;&nbsp;总损耗数量: {{getDamagedCount(total_count)}}    &nbsp;&nbsp;总报损金额:{{(total_count * min_price).toFixed(2)}}</div>
           </el-row>
           <el-row>
             <el-table

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -42,7 +42,7 @@
             </div> -->
         </div>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
-            <el-table-column prop="date" label="药品名称" width="200" align="center">
+            <el-table-column prop="date" label="药品名称" align="center">
                <template slot-scope="scope">
                  {{scope.row.drug_name}}
                </template>

src/xt_pages/stock/inventory.vue

@@ -12,9 +12,9 @@
         style="width:300px;"
       >
         <i class="el-icon-search el-input__icon" slot="suffix"></i>
-      <template slot-scope="{ item }">
-        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
-      </template>
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+        </template>
     </el-autocomplete>  
   </div>
    <div v-show="showTable">

src/xt_pages/stock/inventoryDetails.vue

@@ -23,7 +23,7 @@
         </div>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice" >
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column prop="date" label="耗材名称"  width="300" align="center">
+            <el-table-column prop="date" label="耗材名称" align="center">
                 <template slot-scope="scope">
                   {{scope.row.good_name}}
                 </template>

src/xt_pages/stock/stockDamaged.vue

@@ -1,120 +1,82 @@
 <template>
-  <div class="main-contain">
-    <!-- <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-    </div> -->
-    <div class="app-container">
-        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
-            <div>
-                <el-input
-                size="small"
-                style="width: 200px;"
-                class="filter-item"
-                v-model.trim="searchKey"
-                placeholder="请输入耗材名称"
-                />
-                <el-button
-                size="small"
-                class="filter-item"
-                type="primary"
-                icon="el-icon-search"
-                @click="search">搜索</el-button>
-                <!-- <el-date-picker
-                size="small"
-                @change="changeStartTime"
-                v-model="start_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
-                </el-date-picker>
-                <el-date-picker
-                size="small"
-                @change="changeEndTime"
-                v-model="end_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
-                </el-date-picker> -->
-            </div>
-            <!-- <div>
-                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary" @click="exportList">导出</el-button>
-            </div> -->
-        </div>
-        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
-            <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <!-- <el-table-column prop="date" label="报损编码" align="center">
-               <template  slot-scope="scope">
-                {{scope.row.warehousing_order}}
-               </template>    
-            </el-table-column> -->
-            <!-- <el-table-column prop="date" label="报损日期"  align="center">
-              <template  slot-scope="scope">
-                {{getTime(scope.row.start_time)}}
-               </template>    
-            </el-table-column> -->
-            <el-table-column prop="date" label="耗材名称"  align="center">
-              <template  slot-scope="scope">
-                {{scope.row.good_name}}
-               </template>    
-            </el-table-column>
-            <el-table-column prop="date" label="耗材规格"  align="center">
-              <template  slot-scope="scope">
-                {{scope.row.specification_name}}
-               </template>    
-            </el-table-column>
-             <el-table-column prop="date" label="总耗损数量"  align="center">
-              <template  slot-scope="scope">
-                {{getDamageCount(scope.row.good_id)}}
-               </template>    
-            </el-table-column>
-            <el-table-column prop="date" label="总报损金额"  align="center">
-              <template  slot-scope="scope">
-                {{scope.row.count}}
-               </template>    
-            </el-table-column>
-            <el-table-column prop="name" label="操作"  align="center">
-              <template  slot-scope="scope">
-                <el-button type="primary" @click="toDamagedDetail(scope.row.good_id)">查看详情</el-button>
-               </template>     
-            </el-table-column>
-            <!-- <el-table-column prop="name" label="审核日期"  align="center">
-              <template  slot-scope="scope">
-                {{getTime(scope.row.checker_time)}}
-             </template>
-            </el-table-column> -->
-            <!-- <el-table-column prop="name" label="核对人"  align="center">
-              <template slot-scope="scope">
-                {{getChecker(scope.row.checker)}}
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="状态"  align="center">
-             <template slot-scope="scope">
-                <span v-if="scope.row.checker_status == 1">已核对</span>
-                <span v-if="scope.row.checker_status == 2">未核对</span>
-              </template>
-            </el-table-column> -->
-            <!-- <el-table-column label="操作"  align="center"  width="200" >
-                <template slot-scope="scope">
-                <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
-                <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
-                </template>
-            </el-table-column> -->
-        </el-table>
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[10, 20, 40, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;text-align: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-        >
-        </el-pagination>
+  <div>
+    <div  style="margin-bottom:10px;">
+        <el-input
+        size="small"
+        style="width: 200px;"
+        class="filter-item"
+        v-model.trim="searchKey"
+        placeholder="请输入耗材名称"
+        />
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="search">搜索</el-button>
     </div>
+  
+    <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
+        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <el-table-column prop="date" label="耗材名称"  align="center">
+          <template  slot-scope="scope">
+            {{scope.row.good_name}}
+            </template>    
+        </el-table-column>
+        <el-table-column prop="date" label="耗材规格"  align="center">
+          <template  slot-scope="scope">
+            {{scope.row.specification_name}}
+            </template>    
+        </el-table-column>
+          <el-table-column prop="date" label="总耗损数量"  align="center">
+          <template  slot-scope="scope">
+            {{getDamageCount(scope.row.good_id)}}
+            </template>    
+        </el-table-column>
+        <el-table-column prop="date" label="总报损金额"  align="center">
+          <template  slot-scope="scope">
+            {{scope.row.count}}
+            </template>    
+        </el-table-column>
+        <el-table-column prop="name" label="操作"  align="center">
+          <template  slot-scope="scope">
+            <el-button type="primary" @click="toDamagedDetail(scope.row.good_id)">查看详情</el-button>
+            </template>     
+        </el-table-column>
+        <!-- <el-table-column prop="name" label="审核日期"  align="center">
+          <template  slot-scope="scope">
+            {{getTime(scope.row.checker_time)}}
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column prop="name" label="核对人"  align="center">
+          <template slot-scope="scope">
+            {{getChecker(scope.row.checker)}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="状态"  align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.checker_status == 1">已核对</span>
+            <span v-if="scope.row.checker_status == 2">未核对</span>
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column label="操作"  align="center"  width="200" >
+            <template slot-scope="scope">
+            <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
+            <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
+            </template>
+        </el-table-column> -->
+    </el-table>
+    <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 40, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;text-align: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+    >
+    </el-pagination>
     <el-dialog
         title="耗材报损"
         :visible.sync="dialogVisible"
@@ -305,13 +267,14 @@
       title="盘点批次详情"
       :visible.sync="modifyDialogVisible"
       width="80%">
-      <span>
         <el-form>
           <el-row>
-            <el-col>
+            <el-col :span="8">
               <el-form-item label="入库单号:">
                  <el-input v-model ="form.warehouseing_order" style="width:200px"></el-input>
               </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-form-item label="原因:">
                   <el-select v-model="form.type" placeholder="请选择">
                       <el-option
@@ -322,11 +285,13 @@
                       </el-option>
                   </el-select>
               </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-button type="primary" @click="toQuery">查询</el-button>
             </el-col>
           </el-row>
-          <el-row>
-            <div>&nbsp;&nbsp; &nbsp;&nbsp;总损耗数量:{{getDamageCount(good_id)}}     &nbsp;&nbsp;总报损金额:{{ (getDamageCount(good_id) * price).toFixed(2) }}</div>
+          <el-row style="margin-bottom:10px;">
+            <div>总损耗数量:{{getDamageCount(good_id)}}     &nbsp;&nbsp;总报损金额:{{ (getDamageCount(good_id) * price).toFixed(2) }}</div>
           </el-row>
           <el-row>
             <el-table
@@ -372,7 +337,6 @@
             </el-table>
           </el-row>
         </el-form>
-      </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="modifyDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="modifyDialogVisible = false">确 定</el-button>