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

src/xt_pages/stock/drugs/drugInventory.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="main-contain">
+  <div class="main-contain" style="height:100%;">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container">
-        <el-tabs v-model="activeName">
+    <div class="app-container" style="height: calc(100vh - 118px);overflow: hidden;">
+        <el-tabs v-model="activeName" style="height: 100%;display: flex;flex-direction: column;">
             <el-tab-pane label="药品盘点" name="first">
                 <drug-inventory></drug-inventory>
             </el-tab-pane>
@@ -77,4 +77,7 @@ export default {
 ::-webkit-scrollbar{
     height: 20px !important;
 }
+.el-tabs__content{
+  overflow-y: auto;
+}
 </style>

src/xt_pages/stock/drugs/inventory.vue

@@ -1,508 +1,91 @@
 <template>
-    <div>
-        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
-            <div>
-                <el-input
-                size="small"
-                style="width: 200px;margin-left:10px;"
-                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-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">
+  <div>
+    <div>日期：2021-10-13    盘点人：赵强</div>
+    <el-collapse v-model="activeNames">
+      <el-collapse-item :name="index" v-for="(item,index) in 10" :key="index">
+        <template slot="title">
+          一致性 Consistency <el-button type="warning" icon="el-icon-remove" style="margin-left:20px;">移除</el-button>
+        </template>
+        <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">
                 <template slot-scope="scope">
                   {{scope.row.drug_name}}
                 </template>
-            </el-table-column>
-            <el-table-column prop="date" label="药品规格" align="center">
+              </el-table-column>
+              <el-table-column  prop="name" label="规格" width="100"  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">
-                  {{scope.row.count}}{{scope.row.warehousing_unit}}<span v-if="scope.row.min_count>0">{{scope.row.min_count}}{{scope.row.min_unit}}</span>
-                </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 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">
-                   {{getDoctorName(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="260">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="editInventory(scope.row.id,scope.row.checker_status,scope.$index)">编辑</el-button>
-                  <el-button type="danger" size="small" @click="deleteDrugInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
-                 
+              </el-table-column>
+              <el-table-column prop="name" label="单位" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.warehousing_unit}}
                 </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"
-        width="1200px"
-        class="addDrugsDialog">
-            <el-form :model="form" class="modifyDialog" label-width="100px">
-              
-                <el-form-item label="药品名称">
-                  <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model="form.drug_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入药品名称"
-                    @select="handleSelect"
-                    style="width:300px;"
-                  >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete>  
-                </el-form-item>
-               
-            </el-form>
-
-
-            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-               
-                <el-table-column prop="date" label="药品名称" width="100" align="center">
-                   <template slot-scope="scope">
-                       {{scope.row.drug_name}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="规格" width="100" align="center">
-                   <template slot-scope="scope">
-                       {{scope.row.specification_name}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="入库单号" width="100" align="center">
-                   <template slot-scope="scope">
-                       {{scope.row.specification_name}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="生产日期" width="100" align="center">
-                   <template slot-scope="scope">
-                       {{scope.row.specification_name}}
-                    </template>
-                </el-table-column>
-                <el-table-column  prop="name" label="有效日期" width="100" align="center">
-                    <template slot-scope="scope">
-                       {{scope.row.manufacturer}}
-                    </template> 
-                </el-table-column>
-                <el-table-column prop="name" label="批号"  width="100" align="center">
+              </el-table-column>
+              <el-table-column prop="name" label="库存数量" width="100"  align="center">
                   <template slot-scope="scope">
-                       {{scope.row.drug_origin_place}}
+                    {{scope.row.total}}
                   </template> 
-                </el-table-column>
-                <el-table-column prop="name" label="单价"  width="100" align="center">
+              </el-table-column>
+              <el-table-column prop="name" label="进价" width="100"  align="center">
                   <template slot-scope="scope">
-                       {{scope.row.drug_origin_place}}
+                    {{scope.row.last_price}}
                   </template> 
-                </el-table-column>
-                <el-table-column prop="name" label="盘点前数量"  width="100" align="center">
+              </el-table-column>
+              <el-table-column prop="name" label="零售价" width="100"  align="center">
                   <template slot-scope="scope">
-                       {{scope.row.drug_origin_place}}
+                    {{scope.row.retail_price}}
                   </template> 
-                </el-table-column>
-                <el-table-column prop="name" label="盘点后数量"  width="100" align="center">
+              </el-table-column>
+              <el-table-column prop="name"  label="零售总价" width="100"  align="center">
                   <template slot-scope="scope">
-                       {{scope.row.drug_origin_place}}
+                    {{scope.row.count * scope.row.retail_price}}
                   </template> 
-                </el-table-column>
-                <el-table-column prop="name" label="盘点原因"  width="100" align="center">
+              </el-table-column>
+              <el-table-column prop="name" label="产地" width="100"  align="center">
                   <template slot-scope="scope">
-                       {{scope.row.drug_origin_place}}
+                    {{scope.row.drug_origin_place}}
                   </template> 
-                </el-table-column>
-                <el-table-column
-                fixed="right"
-                width="100"
-                label="操作">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="toEdit(scope.row,scope.$index)">编辑</el-button>
-                        <el-button type="text" size="small" @click="toDelete(scope.$index)">删除</el-button>
-                       
-                    </template>
-                </el-table-column>
-            </el-table>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveDrugInventory">确 定</el-button>
-            </span>
-        </el-dialog>
-
-
-          <el-dialog
-            title="库房调价"
-            :visible.sync="editdialogVisible"
-            width="1200px">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.drug_id" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="药品名称">
-                  <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model="form.drug_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入药品名称"
-                    @select="handleSelect"
-                    style="width:160px;"
-                  >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete>  
-                </el-form-item>
-                <el-form-item label="规格">
-                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
-                </el-form-item>
-               <el-form-item label="批次">
-                  <el-select v-model="form.batch_number" filterable placeholder="请选择" @change="changeNumber">
-                      <el-option
-                        v-for="(item,index) in numberList"
-                        :key="index"
-                        :label="item.batch_number"
-                        :value="item.id">
-                      </el-option>
-                  </el-select>
-                </el-form-item>
-              
-                <el-form-item label="进货价">
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
-                </el-form-item>
-
-                <div style="width:100%;display:flex;">
-                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
-                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
-                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                 </el-form-item>
-                </div>
-                <el-form-item label="库存">
-                    <el-input v-model="form.total" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="产地">
-                    <el-input v-model="form.drug_origin_place"></el-input>
-                </el-form-item>
-                <el-form-item label="批准文号">
-                    <el-input v-model="form.number"></el-input>
-                </el-form-item>
-                <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer"></el-input>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"></el-input>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="editdialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveInventory">确 定</el-button>
-            </span>
-        </el-dialog>
-
-      <el-dialog
-        title="药品盘点核对"
-        :visible.sync="checkDialogVisible"
-        width="30%"
-        >
-        <span>
-          <el-form :model="form">
-            <el-row>
-              <el-col>
-                <el-form-item label="核对时间">
-                 <el-date-picker
-                    size="small"
-                    v-model="check_time"
-                    type="date"
-                    style="margin-left:5px;width:140px;"
-                    placeholder="选择日期">
-                  </el-date-picker>
-                </el-form-item>  
-              </el-col>
-            </el-row>  
-             <el-row>
-              <el-col>
-                <el-form-item label="核对人">
-                  <el-select v-model="checker" placeholder="请选择">
-                    <el-option
-                    v-for="item in doctorList"
-                    :key="item.admin_user_id"
-                    :label="item.user_name"
-                    :value="item.admin_user_id">
-                    </el-option>
-                 </el-select>
-                </el-form-item>  
-              </el-col>
-            </el-row>  
-          </el-form>  
-        </span>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="checkDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="SaveDrugCheckedInventory">保 存</el-button>
-        </span>
-    </el-dialog>
-
-
-       <el-dialog
-            title="库房调价"
-            :visible.sync="modifydialogVisible"
-            width="1200px">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.drug_id"></el-input>
-                </el-form-item>
-                <el-form-item label="药品名称">
-                  <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model="form.drug_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入药品名称"
-                    @select="handleSelect"
-                    style="width:160px;"
-                  >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete>  
-                </el-form-item>
-                <el-form-item label="规格">
-                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
-                </el-form-item>
-                <!-- <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
-                </el-form-item> -->
-                <!-- <el-form-item prop="warehousing_unit" label="单位">
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                </el-form-item> -->
-                <el-form-item label="进货价">
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
-                </el-form-item>
-                <!-- <el-form-item label="盘点数量">
-                    <el-input v-model="form.count"></el-input>
-                </el-form-item> -->
-              
-                <div style="width:100%;display:flex;">
-                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
-                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
-                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                 </el-form-item>
-                </div>
-                <el-form-item label="库存">
-                    <el-input v-model="form.total" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="产地">
-                    <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="批准文号">
-                    <el-input v-model="form.number" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"></el-input>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="modifydialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="modifyInventory">确 定</el-button>
-            </span>
-        </el-dialog>
-
-
-         <el-dialog
-            title="校正"
-            :visible.sync="profdialogVisible"
-            width="1200px">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-
-                <el-form-item label="药品名称">
-                  <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model="form.drug_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入药品名称"
-                    @select="handleSelect"
-                    style="width:160px;"
-                  >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete>  
-                </el-form-item>
-                <!-- <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit"></el-input>
-                </el-form-item> -->
-                <el-form-item prop="warehousing_unit" label="单位">
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="盘点数量">
-                    <el-input v-model="form.count"></el-input>
-                </el-form-item>
-                <el-form-item label="校正数量">
-                    <el-input v-model="form.proof_count" type="number"></el-input>
-                </el-form-item>
-              
-                <el-form-item label="库存">
-                    <el-input v-model="form.total" :disabled="true"></el-input>
-                </el-form-item>
+              </el-table-column>
+              <el-table-column prop="name" label="生产厂商" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.manufacturer}}
+                  </template> 
+              </el-table-column>
+              <el-table-column prop="name" label="实盘点" width="100"  align="center">
+                <template slot-scope="scope">
+                    {{scope.row.count}}{{scope.row.warehousing_unit}} <span v-if="scope.row.min_count">{{scope.row.min_count}}{{scope.row.min_unit}}</span>
+                  </template> 
+              </el-table-column>
+              <!-- <el-table-column  prop="name" label="亏损价格" width="100"  align="center">
+                <template slot-scope="scope">
                 
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"></el-input>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="profdialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="proofInventory">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+                  </template>  
+              </el-table-column> -->
+              <el-table-column prop="name" label="生产日期" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{getTime(scope.row.product_date)}}
+                  </template>  
+              </el-table-column>
+              <el-table-column prop="name" label="有效日期" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{getTime(scope.row.expiry_date)}}
+                  </template>  
+              </el-table-column>
+              <!-- <el-table-column
+              fixed="right"
+              width="100"
+              label="操作">
+                  <template slot-scope="scope">
+                      <el-button type="text" size="small">删除</el-button>
+                      <el-button type="text" size="small">编辑</el-button>
+                  </template>
+              </el-table-column> -->
+          </el-table>
+      </el-collapse-item>
+    </el-collapse>
+    <el-input v-model="input" placeholder="请输入内容"></el-input>
+  </div>
 </template>
 
 <script>
@@ -519,7 +102,7 @@ export default {
             value2:'',
             tableData: [],
             dialogVisible:false,
-           form: {
+            form: {
                 id:"",
                 drug_name: '',
                 retail_price :'',
@@ -577,7 +160,8 @@ export default {
               {id:3,name:"退货"},
               {id:4,name:"人为损坏"},
               {id:5,name:"不计入报损分析"},
-            ]
+            ],
+            activeNames: [0]
         }
     },
     methods:{