数据

src/api/stock.js

@@ -729,3 +729,19 @@ export function postSearchGoodWarehouseList(params) {
     params: params
   })
 }
+
+export function saveAdjustPrice(data) {
+  return request({
+    url: '/api/stock/saveadjustprice',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getAllStockPrice(params) {
+  return request({
+    url: '/api/stock/getallstockprice',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -633,6 +633,7 @@ export default {
       }
      import('@/vendor/Export2Excel').then(excel => {
       console.log("23232323",this.exportList)
+      return
       for(let i=0;i<this.exportList.length;i++){
         this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
         this.exportList[i].drug_name = this.exportList[i].BaseDrugLib.drug_name

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

@@ -474,14 +474,14 @@ export default {
         for(let i=0;i<this.tablePrint.length;i++){
            this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
           //  this.tablePrint[i].total_price = this.tablePrint[i].last_price * this.tablePrint[i].count
-           this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
+           this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
            this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
         }
        console.log("列表数据333333333",this.tablePrint)
      
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','remark']
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','total_price','remark']
       //  let obj = {'index':'合计','total_price':0}
       //  for(let i=0;i<this.tablePrint.length;i++){
       //    obj.total_price += (this.tablePrint[i].min_price * this.tablePrint[i].count)
@@ -552,7 +552,7 @@ export default {
                   drug_spec:item.XtBaseDrug.drug_spec,
                   min_unit:item.XtBaseDrug.min_unit,
                   count:0,
-                  price:item.XtBaseDrug.retail_price,
+                  price:item.XtBaseDrug.last_price,
                   remark:item.XtBaseDrug.remark,
                   total_price:"",
                   dose:item.XtBaseDrug.dose,

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -187,7 +187,7 @@
                  drug_spec:item.drug_spec,
                  min_unit:item.min_unit,
                  count:0,
-                 price:item.price,
+                 last_price:item.XtBaseDrug.last_price,
                  remark:item.remark,
                  total_price:"",
                  dose:item.dose,
@@ -285,7 +285,7 @@
                   drug_spec:item.XtBaseDrug.drug_spec,
                   min_unit:item.XtBaseDrug.min_unit,
                   count:0,
-                  price:item.XtBaseDrug.retail_price,
+                  price:item.XtBaseDrug.last_price,
                   remark:item.XtBaseDrug.remark,
                   total_price:"",
                   dose:item.XtBaseDrug.dose,
@@ -348,7 +348,7 @@
         for(let j=0;j<arr.length;j++){
           total +=arr[j].count
         }
-        console.log("total23232",total)
+       
         return (total*min_price).toFixed(2)
       }
     },

src/xt_pages/stock/stockModifyPrice.vue

@@ -19,6 +19,7 @@
             type="primary"
             icon="el-icon-search"
             @click="search"
+            placeholder="请输入单据编号或操作人姓名"
             >搜索</el-button
             >
             <el-date-picker
@@ -43,46 +44,83 @@
             <el-button size="small" type="primary">导出</el-button>
         </div>
       </div>
-      <div style="display: flex;justify-content: space-between;margin-top:10px">
-            <div style="width:541px;margin-right:10px;">
-                <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+      <div>
+            <div style="width:100%;margin-right:10px;margin-top:10px">
+                <el-table :data="tableList" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
                     <el-table-column prop="date" label="单据编码" width="100">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" align="center">
                           {{scope.row.warehousing_order}}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="date" label="调价日期"width="100">
-                     <template slot-scope="scope">
-                          {{scope.row.start_time}}
-                     </template> 
+                    <el-table-column label="耗材名称" width="100" align="center">
+                        <template slot-scope="scope">
+                           {{scope.row.good_name}}
+                        </template>
                     </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="操作人"
-                    width="80">
+                    <el-table-column label="规格" width="100">
+                      <template slot-scope="scope">
+                         {{scope.row.specification_name}}
+                      </template>
                     </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="状态"
-                    width="80">
+                    <el-table-column label="单位" width="100">
+                      <template slot-scope="scope">
+                         {{scope.row.GoodInfo.packing_unit}}
+                      </template>
                     </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="核对人"
-                    width="80">
+                    <el-table-column label="调价数量" width="100">
+                      <template slot-scope="scope">
+                       {{scope.row.count}}
+                      </template>
                     </el-table-column>
-                    <el-table-column
-                    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 label="原进货价" width="100">
+                      <template slot-scope="scope">
+                       {{scope.row.buy_price}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="原零售价" width="100">
+                      <template slot-scope="scope">
+                       {{scope.row.packing_price}}
+                     </template>
+                    </el-table-column>
+                    <el-table-column label="生产厂商" width="100">
+                      <template slot-scope="scope">
+                       {{scope.row.manufacturer}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="经销商" width="100">
+                      <template slot-scope="scope">
+                        {{scope.row.dealer}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作人" width="100">
+                      <template slot-scope="scope">
+                        {{getDoctor(scope.row.creater)}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="核对人" width="100">
+                      <template slot-scope="scope">
+                         {{getDoctor(scope.row.checker)}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="状态" width="100">
+                      <template slot-scope="scope">
+                        <span v-if="scope.row.checker_status == 2">未核对</span>
+                        <span v-if="scope.row.checker_status == 1">已核对</span>  
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="date" label="调价日期" width="100">
+                     <template slot-scope="scope">
+                          {{getTime(scope.row.start_time)}}
+                     </template> 
+                    </el-table-column>
+                    <el-table-column label="备注" width="100">
+                       <template slot-scope="scope">
+                         {{scope.row.remark}}
+                       </template>
                     </el-table-column>
                 </el-table>
             </div>
-            <!-- <div style="flex:1;"> -->
-                <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                <!-- <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
                     <el-table-column
                     fixed="left"
                     prop="date"
@@ -154,8 +192,8 @@
                     label="有效日期"
                     width="100">
                     </el-table-column>
-                </el-table>
-            <!-- </div> -->
+                </el-table> -->
+         
         </div>
     </div>
     <el-dialog
@@ -266,22 +304,23 @@
             label="操作">
                 <template slot-scope="scope">
                     <el-button type="text" size="small" @click="deletePrice(scope.$index)">删除</el-button>
-                    <el-button type="text" size="small" @click="editPrice(scope.row.id)">编辑</el-button>
+                    <el-button type="text" size="small" @click="editPrice(scope.row)">编辑</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="dialogVisible = false">确 定</el-button>
+            <el-button type="primary" @click="saveAdjustPrice">确 定</el-button>
         </span>
     </el-dialog>
     
+    <!-- 编辑调价 -->
     <el-dialog
         title="编辑"
         :visible.sync="editPriceDialogVisible"
         width="50%">
         <span>
-          <el-form :ref="form" >
+          <el-form  :model="form">
             <el-row>
                <el-col>
                 <el-form-item label="耗材名称:">
@@ -302,13 +341,31 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
-              </el-col> 
+               <el-form-item label="原价格：">
+                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="现价格：">
+                    <el-input v-model="form.new_price" style="width:200px"></el-input>
+                </el-form-item>
+             </el-col> 
+            </el-row>
+            <el-row>
+             <el-col>
+               <el-form-item label="调价数量：">
+                    <el-input v-model="form.count"  style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="备注：">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"  style="width:200px"></el-input>
+                    </div>
+                </el-form-item>
+              </el-col>  
             </el-row>
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            <el-button @click="editPriceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="upatePrice">保存</el-button>
         </span>
     </el-dialog>
   </div>
@@ -316,7 +373,7 @@
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-import { postSearchGoodWarehouseList} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveAdjustPrice,getAllStockPrice} from "@/api/stock"
 import { uParseTime } from '@/utils/tools'
 export default {
     name: "stockModifyPrice",
@@ -338,6 +395,7 @@ export default {
             tableData: [],
             dialogVisible:false,
             form: {
+                id:"",
                 good_name: '',
                 packing_price:'',
                 new_price:"",
@@ -358,6 +416,8 @@ export default {
             dealerList:[],
             currentIndex: 0,
             editPriceDialogVisible:false,
+            tableList:[],
+            doctorList:[]
         }
     },
     methods:{
@@ -410,7 +470,8 @@ export default {
         },
         handleSelect(val){
           console.log("val23232323",val)
-          this.form.good_id = val.id,
+          this.form.id = val.id
+          this.form.good_id = val.good_id,
           this.form.good_name = val.good_name
           this.form.packing_price = val.packing_price
           this.form.warehousing_order = val.warehousing_order
@@ -421,12 +482,14 @@ export default {
           this.form.remark = val.remark
           this.form.buy_price = val.buy_price
           this.form.warehousing_unit = val.packing_unit
+         
       },
       handleClose(){
 
       },
       addPrice(){
         var obj = {
+         id:this.form.id,
          good_name:this.form.good_name,
          specification_name:this.form.specification_name,
          warehousing_order:this.form.warehousing_order,
@@ -440,6 +503,8 @@ export default {
          count:this.form.count,
          new_price:this.form.new_price,
          remark:this.form.remark,
+         buy_price:this.form.buy_price,
+         good_id:this.form.good_id,
         }
        this.tableData.push(obj)
        this.form.good_name = ""
@@ -454,6 +519,7 @@ export default {
        this.form.count = ""
        this.form.new_price = ""
        this.form.remark = ""
+       this.form.buy_price= ""
       },
       getTime(val) {
          if(val < 0){
@@ -467,11 +533,80 @@ export default {
       },
      deletePrice(index){
       this.tableData.splice(index,1)
+     },
+     editPrice(row){
+      console.log("row232233223",row)
+      this.form.good_name = row.good_name
+      this.form.packing_price = row.packing_unit
+      this.form.new_price = row.new_price
+      this.form.count = row.count
+      this.form.remark = row.remark
+      this.form.id = row.id
+      this.editPriceDialogVisible = true  
+     },
+     upatePrice(){
+       for(let i=0;i<this.tableData.length;i++){
+         if(this.form.id == this.tableData[i].id){
+            this.tableData[i].good_name = this.form.good_name
+            this.tableData[i].packing_price = this.form.packing_price
+            this.tableData[i].new_price = this.form.new_price
+            this.tableData[i].count = this.form.count
+            this.tableData[i].remark = this.form.remark
+         }
+       }
+       this.editPriceDialogVisible = false
+     },
+     saveAdjustPrice(){
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableData[i].buy_price = this.tableData[i].buy_price.toString()
+           this.tableData[i].packing_price = this.tableData[i].packing_price.toString()
+           this.tableData[i].new_price = this.tableData[i].new_price.toString()
+           this.tableData[i].count =  parseInt(this.tableData[i].count)
+         }
+         var params= {
+           tableData:this.tableData,
+         }
+      console.log("parasm222",params)
+      saveAdjustPrice(params).then(response=>{
+        if(response.data.state == 1){
+          var msg =  response.data.data.msg
+          console.log("msg",msg)
+          this.$message.success("保存成功!")
+          this.dialogVisible = false
+        }
+      })  
+     },
+     getAllStockPrice(){
+         var params = {
+            keyword:this.searchKey,
+            start_time:this.start_time,
+            end_time:this.end_time,
+         }
+       getAllStockPrice(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("zhognguoffs",list)
+           this.tableList = list
+           var doctor = response.data.data.doctor
+           console.log("doctor",doctor)
+           this.doctorList = doctor
+         }
+       })  
+     },
+     getDoctor(id){
+       var user_name = ""
+       for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+             user_name = this.doctorList[i].user_name
+          }
+       }
+       return user_name
      }
     },
     created(){
         let tableHeight = document.body.clientHeight - 200;
         this.tableHeight = tableHeight
+        this.getAllStockPrice()
     },
     mounted() {
       const that = this;