数据

src/api/stock.js

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

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -128,6 +128,7 @@
                 style="padding-top: 17px"
               >
                 <el-input
+                 oninput="value=value.replace(/[^0-9.]/g,'')"
                   placeholder="请输入退库数量"
                   type="number"
                   v-model="scope.row.price"
@@ -528,6 +529,9 @@ export default {
           for (let i = 0; i < array.length; i++) {
             array[i].price = (array[i].price).toString()
             total = total + array[i].price * array[i].return_count;
+            if(array[i].number == undefined){
+               array[i].number = ""
+            }
           }
 
           if (this.recordInfo.recordData.length <= 0) {

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -75,7 +75,7 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"></el-input>
+                <el-input type="number" v-model="scope.row.count"  oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
               </el-form-item>
             </template>
           </el-table-column>

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -252,7 +252,9 @@ export default {
         query: {
           type: 4,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          limit:this.limit,
+          page:this.page
         }
       });
     },
@@ -558,16 +560,14 @@ export default {
      
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
-          this.tableList[i].drug_name =  this.typeNameOne(this.tableList[i].good_id) 
-          this.tableList[i].drug_spec =  this.specificationName(this.tableList[i].good_id)
-          this.tableList[i].min_unit = this.getUnit(this.tableList[i].GoodInfo.good_unit)
-          this.tableList[i].remark = this.tableList[i].GoodInfo.remark
-          this.tableList[i].packing_unit = this.tableList[i].packing_unit
-         
+          this.tableList[i].good_name = this.tableList[i].GoodInfo.good_name
+          this.tableList[i].specification_name = this.tableList[i].GoodInfo.specification_name
+          this.tableList[i].packing_unit = this.tableList[i].GoodInfo.packing_unit
+          this.tableList[i].total_price = (this.tableList[i].count * this.tableList[i].price).toFixed(2)
         }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'packing_unit','count','remark']
+       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','退库价','总价','备注']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total_price','remark']
        
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)

src/xt_pages/stock/detail/print.vue

@@ -10,8 +10,8 @@
         <div class="dialysis-print-order">
           <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title" v-if="type == 1">入库单</div>
-          <div class="order-title" v-if="type == 2">退货单</div>
-          <div class="order-title" v-if="type == 3">出库单</div>
+        
+          <div class="order-title" v-if="type == 2">出库单</div>
           <div class="order-title" v-if="type == 4">退库单</div>
 
           <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
@@ -23,68 +23,68 @@
             <tbody>
             <tr>
               <td style="line-height: 50px" width="50">序号</td>
-              <td style="line-height: 50px" width="250">耗材名称</td>
-              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="200">耗材名称</td>
+              <td style="line-height: 50px" width="200">规格型号</td>
+              <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height: 50px" width="50">单位</td>
             
-              <td style="line-height: 50px" width="80">数量</td>
-              <td style="line-height:50px" width="80" v-if="type == 1">进货价</td>
-              <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
-              <td style="line-height: 50px" width="80" v-if="type == 1 || type == 3">总价</td>
-              <td style="line-height: 50px" width="">备 注</td>
+              <td style="line-height:50px" width="80">
+                <span v-if="type == 1">进货价</span> 
+                <span v-if="type == 2">出货价</span> 
+                <span v-if="type == 4">退库价</span> 
+              </td>
+              <td style="line-height: 50px" width="80">总价</td>
+              <td style="line-height: 50px" width="80">备 注</td>
             </tr>
 
-            <tr v-for="(stock,index) in stockDatas" :key="stock.id">
+            <tr v-for="(item,index) in stockDatas" :key="item.id">
               <td style="line-height: 50px">&nbsp;
                 {{index+1}}
               </td>
               <td style="line-height: 50px">
-                <span>{{stock.good_name}}</span>
+                <span>{{item.GoodInfo.good_name}}</span>
               </td>
               <td style="line-height: 50px">
-                <span v-if="stock">{{stock.specification_name}}</span>
+                <span>{{item.GoodInfo.specification_name}}</span>
               </td>
+             
               <td style="line-height: 50px">
-                <span>{{stock.packing_unit}}</span>
+                <span v-if="type == 1"> {{ item.warehousing_count }}</span>
+                <span v-if="type == 2"> {{ item.count }}</span>
+                <span v-if="type == 4"> {{ item.count }}</span>
               </td>
-            
               <td style="line-height: 50px">
-                <span v-if="type == 3">
-                  <span v-if="org_id == 10090">{{getWareOut(stock.id)}}</span>
-                  <span else>{{getStockCount(stock.id)}}</span>
-                </span>
-                <span v-else>{{calCount(stock)}}</span> 
+                <span>{{item.GoodInfo.packing_unit}}</span>
               </td>
-              <td style="line-height:50px" v-if="type == 1 && stock.query_warehousing_info.length > 0">{{stock.query_warehousing_info[0].price}}</td>
-              <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">
-                <!-- {{stock.query_warehouseout_info[0].price}} -->
-                {{getReailPrice(stock.id)}}
+              <td style="line-height:50px">
+                <span v-if="type == 1"> {{ item.price }}</span>
+                <span v-if="type == 2"> {{ item.price }}</span>
+                 <span v-if="type == 4"> {{ item.price }}</span>
+              </td>
+              <td style="line-height:50px">
+                <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
+                <span v-if="type == 2">{{(item.count * item.price).toFixed(2)}}</span>
+                <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
+              </td>
+              <td style="line-height: 50px">
+                 <span v-if="type == 1">{{item.remark}}</span>
               </td>
-              <td style="line-height: 50px" v-if="type == 1">{{calTotal(stock)}}</td>
-              <td style="line-height: 50px" v-if="type == 3">
-                
-                  <span v-if="org_id == 10090">{{getPrice(stock.id)}}</span>
-                  <span v-else>{{(getStockCount(stock.id) * getReailPrice(stock.id)).toFixed(2)}}</span> 
-               
-             </td>
-              <td style="line-height: 50px"></td>
             </tr>
             </tbody>
           </table>
-          <table class="print-table" border="1" v-if="type == 1 || type == 3">
-            <tbody>
+          <table class="print-table" border="1">
             <tr>
-              <td width="633" style="line-height: 50px">合计</td>
+              <td style="line-height: 50px" colspan="6" width="550">合计</td>
+              <td width="80" style="line-height: 50px" >
+                <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
+                <span v-if="type == 2">{{getWareOutTotal().toFixed(2)}}</span> 
+                <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
+              </td>
               <td width="80" style="line-height: 50px">
-                <span v-if="type == 1">{{calTotalPrice()}}</span>
-                <span v-if="type == 3 && org_id!=10090">{{getTotalPrice().toFixed(2)}}</span>
-                <span v-if="type == 3 && org_id==10090">{{getTotalPriceOne().toFixed(2)}}</span>
+
               </td>
-              <td></td>
             </tr>
-
-            </tbody>
-          </table>
+          </table> 
 
           <div style="display:flex;margin-top:20px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
@@ -104,7 +104,7 @@
 </template>
 
 <script>
-  import { getPrintStockGood } from '@/api/stock'
+  import { getPrintStockGood,getGoodDetailPrintList,getStockDetail } from '@/api/stock'
   import { getDataConfig } from '@/utils/data'
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -127,7 +127,9 @@
         queryParams: {
           start_time: this.$route.query.start_time,
           end_time: this.$route.query.end_time,
-          type: this.$route.query.type
+          type: this.$route.query.type,
+          limit:this.$route.query.limit,
+          page:this.$route.query.page,
         },
         totalPrice: 0,
         stockDatas: [],
@@ -414,14 +416,49 @@
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
      },
+     getGoodDetailPrintList(){
+      getGoodDetailPrintList(this.queryParams).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("list",list)
+           
+         }
+      })
+     },
+
+     getStockDetail(){
+      getStockDetail(this.queryParams).then(response=>{
+        if(response.data.state == 1){
+          var total =   response.data.data.total
+          var list = response.data.data.list
+          console.log("list2323223",list)
+          this.stockDatas = list
+        }
+      })
+     },
+     getWareInfoTotal(){
+       var total = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         total+= this.stockDatas[i].warehousing_count * this.stockDatas[i].price
+       }
+       return total
+     },
+     getWareOutTotal(){
+       var total = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         total+= this.stockDatas[i].count * this.stockDatas[i].price
+       }
+       return total
+     }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       this.goodUnit = this.$store.getters.good_unit
 
-      this.getDialysisRecord()
-
+      // this.getDialysisRecord()
+      // this.getGoodDetailPrintList()
+      this.getStockDetail()
     }
 
   }

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -329,7 +329,9 @@ export default {
         query: {
           type: 2,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          limit:this.limit,
+          page:this.page
         }
       });
     },

src/xt_pages/stock/detail/stockInDetail.vue

@@ -233,7 +233,7 @@ export default {
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
 
-    this.getPrintStockGood()
+    // this.getPrintStockGood()
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     console.log("机构ID",this.org_id)
   },
@@ -277,17 +277,17 @@ export default {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     changeDealer: function(val) {
       this.dealer_id = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     getTypeName: function(row) {
       let name = "";
@@ -336,6 +336,7 @@ export default {
         keywords: this.searchKey
       };
       this.cancelStockDate = [];
+      this.tableList = []
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
@@ -345,6 +346,7 @@ export default {
           console.log("hhhhhhshsss",response.data.data.list)
           var total_price = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
+            this.tableList.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
             total_price += response.data.data.list[i].price * response.data.data.list[i].warehousing_count
             obj["is_total"] = 0;
@@ -394,11 +396,15 @@ export default {
         } else {
           this.total = response.data.data.total;
           var total_price = ""
+         
+        
           for (let i = 0; i < response.data.data.list.length; i++) {
+            this.tableList.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
           }
+        
           this.cancelStockDate.push({
             warehousing_order: "合计",
             is_total: 1,
@@ -453,12 +459,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -467,7 +473,7 @@ export default {
         this.start_time = "";
       } else {
         this.GetCancelStock();
-        this.getPrintStockGood()
+        // this.getPrintStockGood()
       }
     },
     endTimeChange(val) {
@@ -477,7 +483,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetCancelStock();
-        this.getPrintStockGood()
+        // this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
@@ -634,7 +640,10 @@ export default {
         query: {
           type: 1,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          limit:this.limit,
+          page:this.page,
+          keywords:this.$router.keywords,
         }
       });
     },
@@ -733,64 +742,91 @@ export default {
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
       },
       
-      exportList(){
-        var obj = {index:"合计",total:0}
-        obj.total = this.calTotalPrice()
+      // exportList(){
+      //   var obj = {index:"合计",total:0}
+      //   obj.total = this.calTotalPrice()
      
-        for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i+1
-          this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
-          this.tableList[i].count = this.calCount(this.tableList[i])
-          this.tableList[i].total = this.calTotal(this.tableList[i])
-          this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
-          this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
-          this.tableList[i].packing_unit = this.tableList[i].packing_unit
-        }
-        console.log("总共条数555",this.tableList)
+      //   for(let i=0;i<this.tableList.length;i++){
+      //     this.tableList[i].index = i+1
+      //     this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
+      //     this.tableList[i].count = this.calCount(this.tableList[i])
+      //     this.tableList[i].total = this.calTotal(this.tableList[i])
+      //     this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
+      //     this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
+      //     this.tableList[i].packing_unit = this.tableList[i].packing_unit
+      //   }
+      //   console.log("总共条数555",this.tableList)
          
-        if(this.org_id == 10024){
-          var arr = this.uniqueOne(this.tableList)
-          this.tableList = arr
-          this.tableList.push(obj)
-          console.log("去重后条数",this.tableList)
+      //   if(this.org_id == 10024){
+      //     var arr = this.uniqueOne(this.tableList)
+      //     this.tableList = arr
+      //     this.tableList.push(obj)
+      //     console.log("去重后条数",this.tableList)
         
-          import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-          const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
+      //     import('@/vendor/Export2Excel').then(excel => {
+      //     const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+      //     const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
           
-          const data = this.formatJson(filterVal, this.tableList)
-
-          console.log("data222222222",data)
-            excel.export_json_to_excel({
-              header: tHeader,
-              data,
-              filename: '耗材入库明细'
-            })
-              this.downloadLoading = false
-            })
-        }
-        if(this.org_id !=10024){
-           var arr = this.unique(this.tableList)
-            this.tableList = arr
-            this.tableList.push(obj)
-            console.log("去重后条数",this.tableList)
+      //     const data = this.formatJson(filterVal, this.tableList)
+
+      //     console.log("data222222222",data)
+      //       excel.export_json_to_excel({
+      //         header: tHeader,
+      //         data,
+      //         filename: '耗材入库明细'
+      //       })
+      //         this.downloadLoading = false
+      //       })
+      //   }
+      //   if(this.org_id !=10024){
+      //      var arr = this.unique(this.tableList)
+      //       this.tableList = arr
+      //       this.tableList.push(obj)
+      //       console.log("去重后条数",this.tableList)
           
-            import('@/vendor/Export2Excel').then(excel => {
-            const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-            const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
+      //       import('@/vendor/Export2Excel').then(excel => {
+      //       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+      //       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
             
-            const data = this.formatJson(filterVal, this.tableList)
-            console.log("data222222222",data)
-              excel.export_json_to_excel({
-                header: tHeader,
-                data,
-                filename: '耗材入库明细'
-              })
-                this.downloadLoading = false
-              })
-        }
+      //       const data = this.formatJson(filterVal, this.tableList)
+      //       console.log("data222222222",data)
+      //         excel.export_json_to_excel({
+      //           header: tHeader,
+      //           data,
+      //           filename: '耗材入库明细'
+      //         })
+      //           this.downloadLoading = false
+      //         })
+      //   }
      
-        },
+      //   },
+      exportList(){
+        // var obj = {index:"合计",total:0}
+        // obj.total = this.calTotalPrice()
+        console.log("hhhh",this.tableList)
+       
+        for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].good_name = this.tableList[i].GoodInfo.good_name
+          this.tableList[i].specification_name = this.tableList[i].GoodInfo.specification_name
+          this.tableList[i].packing_unit = this.tableList[i].GoodInfo.packing_unit
+          this.tableList[i].index = i+1  
+          this.tableList[i].total_price = (this.tableList[i].warehousing_count * this.tableList[i].price).toFixed(2) 
+        }
+        console.log("总共条数555",this.tableList)   
+        import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
+        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
+        
+        const data = this.formatJson(filterVal, this.tableList)
+        console.log("data222222222",data)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材入库明细'
+          })
+            this.downloadLoading = false
+        })
+      },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -225,7 +225,7 @@ export default {
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
-    this.getPrintStockGood()
+    // this.getPrintStockGood()
     this.getList()
     var org_id = this.$store.getters.xt_user.org.id
     this.orgId = org_id
@@ -265,18 +265,19 @@ export default {
       stockTotal:[],
       goodInfoData:[],
       orgId:"",
+      tableData:[]
     };
   },
   methods: {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     getTypeName: function(row) {
       let name = "";
@@ -335,6 +336,7 @@ export default {
 
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
+            this.tableData.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
@@ -379,7 +381,9 @@ export default {
           this.total = response.data.data.total;
           console.log("详情23233323",response.data.data.list)
           for (let i = 0; i < response.data.data.list.length; i++) {
+            this.tableData.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
+
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
             
@@ -439,12 +443,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
-      this.getPrintStockGood()
+      // this.getPrintStockGood()
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -453,7 +457,7 @@ export default {
         this.start_time = "";
       } else {
         this.GetCancelStock();
-        this.getPrintStockGood()
+        // this.getPrintStockGood()
       }
     },
     endTimeChange(val) {
@@ -463,7 +467,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetCancelStock();
-        this.getPrintStockGood()
+        // this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
@@ -625,9 +629,11 @@ export default {
       this.$router.push({
         path: "/stock/print",
         query: {
-          type: 3,
+          type: 2,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          limit:this.limit,
+          page:this.page
         }
       });
     },
@@ -745,36 +751,59 @@ export default {
         })
       },
 
-     exportList(){
+    //  exportList(){
       
-      for(let i=0;i<this.tableList.length;i++){
-         for(let j=0;j<this.goodInfoData.length;j++){
-            if(this.tableList[i].id === this.goodInfoData[j].id){
-               this.tableList[i].buy_price = this.goodInfoData[j].buy_price
-            }
-         }
-      }
-      console.log('合并后',this.tableList)
+    //   for(let i=0;i<this.tableList.length;i++){
+    //      for(let j=0;j<this.goodInfoData.length;j++){
+    //         if(this.tableList[i].id === this.goodInfoData[j].id){
+    //            this.tableList[i].buy_price = this.goodInfoData[j].buy_price
+    //         }
+    //      }
+    //   }
+    //   console.log('合并后',this.tableList)
       
-      var obj = {index:"合计",total:0}
-       obj.total = this.getTotalPrice()
-       for(let i=0;i<this.tableList.length;i++){
-        this.tableList[i].index = i+1
-        this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
-        this.tableList[i].count = this.getStockCount(this.tableList[i].id)
-        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
-        this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
-        this.tableList[i].packing_unit = this.tableList[i].packing_unit
-       }
-       var arr = this.unique(this.tableList)
+    //   var obj = {index:"合计",total:0}
+    //    obj.total = this.getTotalPrice()
+    //    for(let i=0;i<this.tableList.length;i++){
+    //     this.tableList[i].index = i+1
+    //     this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
+    //     this.tableList[i].count = this.getStockCount(this.tableList[i].id)
+    //     this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
+    //     this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
+    //     this.tableList[i].packing_unit = this.tableList[i].packing_unit
+    //    }
+    //    var arr = this.unique(this.tableList)
      
-       this.tableList = arr
-       this.tableList.push(obj)
+    //    this.tableList = arr
+    //    this.tableList.push(obj)
+    //    import('@/vendor/Export2Excel').then(excel => {
+    //    const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+    //    const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','buy_price','total','remark']
+
+    //    const data = this.formatJson(filterVal, this.tableList)
+    //    console.log("data",data)
+       
+    //     excel.export_json_to_excel({
+    //        header: tHeader,
+    //        data,
+    //        filename: '耗材出库明细'
+    //      })
+    //       this.downloadLoading = false
+    //     })
+    //    },
+    exportList(){
+       for(let i=0;i<this.tableData.length;i++){
+        this.tableData[i].index = i+1
+        this.tableData[i].good_name = this.tableData[i].GoodInfo.good_name
+        this.tableData[i].specification_name = this.tableData[i].GoodInfo.specification_name
+        this.tableData[i].packing_unit = this.tableData[i].GoodInfo.packing_unit
+        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price).toFixed(2)
+       }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','buy_price','total','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total_price','remark']
 
-       const data = this.formatJson(filterVal, this.tableList)
+       const data = this.formatJson(filterVal, this.tableData)
        console.log("data",data)
        
         excel.export_json_to_excel({
@@ -784,7 +813,7 @@ export default {
          })
           this.downloadLoading = false
         })
-       },
+     },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -303,7 +303,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -368,6 +368,8 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          console.log("列表23232323232323",response.data.data.list)
+          
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.cancelStockDate.push(response.data.data.list[i]);

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -155,6 +155,7 @@
               >
               <div style="display:flex;">
                 <el-input
+                  oninput="value=value.replace(/[^0-9.]/g,'')"
                   style="width:100px"
                   placeholder="请输入退库数量"
                   type="number"
@@ -498,7 +499,7 @@ export default {
       tempObj["product_date"] = ""
       tempObj["expiry_date"] = ""
       tempObj["batch_number"] = ""
-      tempObj["batch_number_id"] = ""
+      tempObj["batch_number_id"] = 0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -607,7 +608,8 @@ export default {
           const params = {
             cancelStock: this.recordInfo.recordData
           };
-          console.log("params2222",params)
+          console.log("params2222",params,this.return_time)
+        
           postDrugCancelStock(
             params,
             this.return_time,
@@ -751,7 +753,7 @@ export default {
     tempObj["product_date"] = ""
     tempObj["expiry_date"] = ""
     tempObj["batch_number"] = ""
-    tempObj["batch_number_id"] = ""
+    tempObj["batch_number_id"] = 0
     this.unitList =  getDataConfig('hemodialysis','units')
     console.log("单位",this.unitList)
     this.recordInfo.recordData.push(tempObj);

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -81,6 +81,7 @@
               >
               <div style="display:flex;">
                 <el-input
+                 oninput="value=value.replace(/[^0-9.]/g,'')"
                   style="width:100px"
                   placeholder="请输入退库数量"
                   type="number"
@@ -133,12 +134,12 @@
                 :prop="'recordData.' + scope.$index + '.return_count'"
                 style="padding-top: 17px"
               >
-               <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
+               <el-select v-model="scope.row.batch_number" filterable placeholder="请选择" :disabled="canCelShow">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.batch_number"
-                    :value="item.batch_number">
+                    :value="item.id">
                   </el-option>
               </el-select>
               </el-form-item>
@@ -341,6 +342,7 @@
         dealerList:[],
         numberList:[],
         unitList:[],
+        canCelShow:true
       }
     },
     methods: {
@@ -426,13 +428,20 @@
         }
         return name;
       }, handleEdit: function(index, row) {
+        this.canCelShow = false
         const tempObj = {}
         tempObj['id'] = 0
-        tempObj['drug_id'] = 0
-        tempObj['count'] = ''
-        tempObj['price'] = ''
-        tempObj['retail_price'] = ''
-
+        tempObj["return_count"] = "";
+        tempObj["price"] = "";
+        tempObj["retail_price"] = "";
+        tempObj["register_account"] = ""
+        tempObj["dealer"] = ""
+        tempObj["manufacturer"] =""
+        tempObj["remark"] = ""
+        tempObj["product_date"] = ""
+        tempObj["expiry_date"] = ""
+        tempObj["batch_number"] = ""
+        tempObj["batch_number_id"] = 0
 
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
@@ -529,18 +538,36 @@
                 return
               }
             }
+            console.log("hhhhh3223",this.recordInfo.recordData)
+            console.log("900000000",this.numberList)
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+              for(let j=0;j<this.numberList.length;j++){
+                 if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
+                   this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number
+                   this.recordInfo.recordData[i].batch_number_id = this.numberList[j].id
+                 }
+              }
+             
+            }
 
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
+            console.log("232323223",this.recordInfo.recordData)
+           
             editDrugCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$message.success('退库成功')
-
-                this.$router.back(-1)
+                if (response.data.data.msg == 1){
+                   this.$message.success('退库成功')
+                   this.$router.back(-1)
+                }
+                if(response.data.data.msg == 2){
+                   this.$message.error("退库数量大于入库数量")
+                }
+              
               }
             })
           } else {
@@ -569,6 +596,7 @@
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.cancelStock = response.data.data.info
+            console.log("hhhh23hh2hh23h223",this.cancelStock)
             this.return_time = this.getTime(this.cancelStock.return_time, '{y}-{m}-{d}')
             this.form.manufacturer = this.cancelStock.manufacturer
             this.form.dealer = this.cancelStock.dealer

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -67,12 +67,14 @@
              <span v-if="scope.row.consumable_type == 1">手动入库</span>
              <span v-if="scope.row.consumable_type == 2">手动出库</span>
              <span v-if="scope.row.consumable_type == 3">自动出库</span>
+             <span v-if="scope.row.consumable_type == 4">手动退库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
               <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>
+              <span v-if="scope.row.consumable_type == 4">{{scope.row.cancel_order_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -85,7 +87,7 @@
              <span v-if="scope.row.consumable_type == 1">{{scope.row.count}}{{scope.row.max_unit}}</span>
              <span v-if="scope.row.consumable_type == 2">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
              <span v-if="scope.row.consumable_type == 3">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
-
+             <span v-if="scope.row.consumable_type == 4">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
             
            </template>
         </el-table-column>
@@ -214,7 +216,7 @@
           {id:1,name:"手动入库"},
           {id:2,name:"手动出库"},
           {id:3,name:"自动出库"},
-        
+          {id:4,name:"手动退库"},
 
         ],
         outList:[],

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -124,6 +124,7 @@
               >
               <div style="display:flex;">
                 <el-input
+                  oninput="value=value.replace(/[^0-9.]/g,'')"
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -189,6 +189,7 @@
               >
                 <div style="display:flex;">
                   <el-input
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
                     placeholder="请输入入库数量"
                     type="number"
                     v-model="scope.row.warehousing_count"

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -149,6 +149,7 @@
               >
                 <div style="display:flex;">
                   <el-input
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
                     style="width:80px"
                     placeholder="请输入出库数量"
                     type="number"

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -110,6 +110,7 @@
               >
                 <div style="display:flex;">
                   <el-input
+                   oninput="value=value.replace(/[^0-9.]/g,'')"
                    style="width:100px"
                    :disabled="drug_show"
                     placeholder="请输入出库数量"

src/xt_pages/stock/drugs/query.vue

@@ -123,7 +123,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="退库数量" align="center">
            <template slot-scope="scope">
-             {{getCancelCount(scope.row.drug_id)}}
+             {{getCancelCount(scope.row.drug_id)}}{{scope.row.max_unit}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">

src/xt_pages/stock/stockFlow.vue

@@ -65,6 +65,7 @@
              <span v-if="scope.row.consumable_type == 1">手动入库</span>
              <span v-if="scope.row.consumable_type == 2">手动出库</span>
              <span v-if="scope.row.consumable_type == 3">自动出库</span>
+             <span v-if="scope.row.consumable_type == 4">手动退库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
@@ -72,6 +73,7 @@
             <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
             <span v-if="scope.row.consumable_type == 2">{{scope.row.warehouse_out_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>  
+            <span v-if="scope.row.consumable_type == 4">{{scope.row.cancel_order_number}}</span>  
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -210,6 +212,7 @@
           {id:1,name:"手动入库"},
           {id:2,name:"手动出库"},
           {id:3,name:"自动出库"},
+          {id:4,name:"手动退库"},
         ],
         countList:[],
         outCountList:[],

src/xt_pages/stock/stockInOrderAdd.vue

@@ -101,7 +101,7 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
                             :rules='tableRules.warehousing_count' style="padding-top: 20px">
-                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"></el-input>
+                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"  oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
                   {{scope.row.min_unit}}
               </el-form-item>
             

src/xt_pages/stock/stockInOrderEdit.vue

@@ -198,6 +198,7 @@
                 style="padding-top: 20px"
               >
                 <el-input
+                  oninput="value=value.replace(/[^0-9.]/g,'')"
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
@@ -824,7 +825,7 @@ export default {
           
           }
          
-         if(val.xt_warehouse_info.length > 0){
+         if(val.xt_warehouse_info !=null &&  val.xt_warehouse_info.length > 0){
            
           for(let j=0;j<val.xt_warehouse_info.length;j++){
               this.numberList.push(val.xt_warehouse_info[j])