数据

src/api/stock.js

@@ -721,3 +721,11 @@ export function getGoodDetailPrintList(params) {
     params: params
   })
 }
+
+export function postSearchGoodWarehouseList(params) {
+  return request({
+    url: '/api/stock/postsearchgoodwarehouselist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -59,7 +59,7 @@
             </tr>
             </tbody>
           </table>
-          <table class="print-table" border="1" >
+          <!-- <table class="print-table" border="1" >
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
@@ -68,7 +68,7 @@
             </tr>
 
             </tbody>
-          </table>
+          </table> -->
 
           <div style="display:flex;margin-top:20px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
@@ -225,7 +225,7 @@
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
-            total += this.cancelStockDate[i].price * this.cancelStockDate[i].count
+            total += this.cancelStockDate[i].price * this.getCount(this.cancelStockDate[i].child,this.cancelStockDate[i].max_unit,this.cancelStockDate[i].min_unit,this.cancelStockDate[i].min_number)
          }
          return total
       },

src/xt_pages/stock/stockModifyPrice.vue

@@ -46,15 +46,15 @@
       <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)' }">
-                    <el-table-column
-                    prop="date"
-                    label="单据编码"
-                    width="100">
+                    <el-table-column prop="date" label="单据编码" width="100">
+                        <template slot-scope="scope">
+                          {{scope.row.warehousing_order}}
+                        </template>
                     </el-table-column>
-                    <el-table-column
-                    prop="date"
-                    label="调价日期"
-                    width="100">
+                    <el-table-column prop="date" label="调价日期"width="100">
+                     <template slot-scope="scope">
+                          {{scope.row.start_time}}
+                     </template> 
                     </el-table-column>
                     <el-table-column
                     prop="name"
@@ -111,7 +111,7 @@
                     </el-table-column>
                     <el-table-column
                     prop="name"
-                    label="供应商"
+                    label="经销商"
                     width="100">
                     </el-table-column>
                     <el-table-column
@@ -195,77 +195,77 @@
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
-                    <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </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">
+            <el-table-column prop="date" label="单据编号" width="100">
+                <template slot-scope="scope">
+                {{scope.row.warehousing_order}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="date"
-            label="药品名称"
-            width="100">
+            <el-table-column prop="date" label="耗材名称" width="100">
+               <template slot-scope="scope">
+                {{scope.row.good_name}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="规格"
-            width="100">
+            <el-table-column prop="name" label="规格" width="100">
+              <template slot-scope="scope">
+               {{scope.row.specification_name}}
+               </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="单位"
-            width="100">
+            <el-table-column prop="name" label="单位" width="100">
+              <template slot-scope="scope">
+               {{scope.row.warehousing_unit}}
+               </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="调价数量"
-            width="100">
+            <el-table-column prop="name" label="调价数量" width="100">
+              <template slot-scope="scope">
+                {{scope.row.count}}
+              </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="原进货价"
-            width="100">
+            <el-table-column prop="name" label="原进货价" width="100">
+               <template slot-scope="scope">
+                {{scope.row.buy_price}}
+               </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="原零售价"
-            width="100">
+            <el-table-column prop="name" label="原零售价" width="100">
+               <template slot-scope="scope">
+               {{scope.row.packing_price}}
+              </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="新零售价"
-            width="100">
+            <el-table-column prop="name" label="新零售价" width="100">
+               <template slot-scope="scope">
+                {{scope.row.new_price}}
+               </template>   
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="生产厂商"
-            width="100">
+            <el-table-column prop="manufacturer" label="生产厂商" width="100">
+                <template slot-scope="scope">
+                 {{scope.row.manufacturer}}
+               </template>     
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="批准文号"
-            width="100">
+            <el-table-column prop="name" label="批准文号" width="100">
+              <template slot-scope="scope">
+                 {{scope.row.license_number}}
+               </template>    
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="供应商"
-            width="100">
+            <el-table-column prop="name" label="经销商" width="100">
+               <template slot-scope="scope">
+                 {{scope.row.dealer}}
+               </template>    
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="备注"
-            width="100">
+            <el-table-column prop="name" label="备注"width="100">
+              <template slot-scope="scope">
+                 {{scope.row.remark}}
+               </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" @click="deletePrice(scope.$index)">删除</el-button>
                     <el-button type="text" size="small">编辑</el-button>
                 </template>
             </el-table-column>
@@ -281,7 +281,8 @@
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-import { postSearchGoodList} from "@/api/stock"
+import { postSearchGoodWarehouseList} from "@/api/stock"
+import { uParseTime } from '@/utils/tools'
 export default {
     name: "stockModifyPrice",
     components:{
@@ -299,23 +300,7 @@ export default {
             searchKey:'',
             value1:'',
             value2:'',
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }],
+            tableData: [],
             dialogVisible:false,
             form: {
                 good_name: '',
@@ -323,6 +308,14 @@ export default {
                 new_price:"",
                 count:"",
                 remark:"",
+                warehousing_order:"",
+                manufacturer:"",
+                dealer:"",
+                license_number:"",
+                warehousing_unit:"",
+                specification_name:"",
+                buy_price:"",
+                good_id:"",
             },
             goodList:[],
             manufacturerList:[],
@@ -342,25 +335,25 @@ export default {
         querySearchAsync(keyword, cb) {
             let key = '';
             if (keyword != undefined) {
-            key = keyword
+             key = keyword
             }
-            postSearchGoodList(key).then(response => {
+            postSearchGoodWarehouseList(key).then(response => {
             if (response.data.state == 1) {
             
                 var list = response.data.data.list
-                
+                console.log("列表数据",list)
                 this.goodList = list
                 var manufacturerList = response.data.data.manufacturerList
                 this.manufacturerList = manufacturerList
                 var dealer =  response.data.data.dealerList
                 this.dealerList = dealer
-                // for(let i=0;i<this.goodList.length;i++){
-                //     for(let j=0;j<this.manufacturerList.length;j++){
-                //     if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-                //         this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-                //     }
-                //     }
-                // }
+                for(let i=0;i<this.goodList.length;i++){
+                  for(let j=0;j<this.manufacturerList.length;j++){
+                    if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                        this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                    }
+                  }
+                }
 
                 // for(let i=0;i<this.goodList.length;i++){
                 // for(let j=0;j<this.dealerList.length;j++){
@@ -377,38 +370,68 @@ export default {
             })
         },
         changeGoodName(val){
-            console.log("val",val)
-            this.currentIndex = val
+         this.currentIndex = val
         },
         handleSelect(val){
+          console.log("val23232323",val)
+          this.form.good_id = val.id,
           this.form.good_name = val.good_name
-        //  for(let i=0;i<this.recordInfo.recordData.length;i++){
-        //    if(this.currentIndex == i){
-        //       this.recordInfo.recordData[i].good_type_id = val.id
-        //       this.recordInfo.recordData[i].good_name = val.good_name
-        //       this.recordInfo.recordData[i].good_type_id = val.good_type_id
-        //       this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
-        //       this.recordInfo.recordData[i].number =  val.number
-        //       this.recordInfo.recordData[i].manufacturer = val.manufacturer
-        //       this.recordInfo.recordData[i].remark = val.remark
-        //       if(val.buy_price == 0){
-        //        this.recordInfo.recordData[i].price = ""
-        //       }else{
-        //         this.recordInfo.recordData[i].price = val.buy_price
-        //       }
-              
-        //       this.recordInfo.recordData[i].specification_name = val.specification_name
-        //       this.recordInfo.recordData[i].good_id = val.id
-        //       this.recordInfo.recordData[i].packing_unit = val.packing_unit
-        //       if(val.dealer == 0){
-        //         this.recordInfo.recordData[i].dealer = ""
-        //       }else{
-        //         this.recordInfo.recordData[i].dealer = val.dealer
-        //       }
-             
-        //    }
-        //  }
-      }
+          this.form.packing_price = val.packing_price
+          this.form.warehousing_order = val.warehousing_order
+          this.form.license_number = val.license_number
+          this.form.dealer = val.dealer
+          this.form.manufacturer = val.manufacturer
+          this.form.specification_name = val.specification_name
+          this.form.warehousing_unit = val.warehousing_unit
+          this.form.remark = val.remark
+          this.form.buy_price = val.buy_price
+      },
+      handleClose(){
+
+      },
+      addPrice(){
+        var obj = {
+         good_name:this.form.good_name,
+         specification_name:this.form.specification_name,
+         warehousing_order:this.form.warehousing_order,
+         good_name:this.form.good_name,
+         packing_price:this.form.packing_price,
+         license_number:this.form.license_number,
+         dealer:this.form.dealer,
+         manufacturer:this.form.manufacturer,  
+         warehousing_unit:this.form.warehousing_unit, 
+         start_time:this.getTime(new Date()),
+         count:this.form.count,
+         new_price:this.form.new_price,
+         remark:this.form.remark,
+        }
+       this.tableData.push(obj)
+       this.form.good_name = ""
+       this.form.specification_name  = ""
+       this.form.warehousing_order = ""
+       this.form.good_name = ""
+       this.form.packing_price = ""
+       this.form.license_number= ""
+       this.form.dealer = ""
+       this.form.manufacturer = ""
+       this.form.warehousing_unit = ""
+       this.form.count = ""
+       this.form.new_price = ""
+       this.form.remark = ""
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+     deletePrice(index){
+      this.tableData.splice(index,1)
+     }
     },
     created(){
         let tableHeight = document.body.clientHeight - 200;

src/xt_pages/user/templateSummary.vue

@@ -564,7 +564,7 @@
 
        <el-dialog
         title="提示"
-        :visible.sync="editDialogVisible"
+        :visible.sync="dialogVisibleInspection"
         width="80%"
         >
         <span>
@@ -1030,6 +1030,7 @@
        })
       },
       toInspection(){
+        
         this.dialogVisibleInspection = true
       },