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

src/xt_pages/dialysis/components/consumables.vue

@@ -21,9 +21,9 @@
                       format="yyyy-MM-dd"
                       value-format="yyyy-MM-dd"
                       placeholder="选择日期时间" align="right"></el-date-picker>
-      <!--<el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"-->
-                <!--class="filter-item"/>-->
-      <!--<el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+      <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+                class="filter-item" v-model="query.keywords"/>
+      <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
     <div class="cell clearfix" style="justify-content: space-between;">
       <div style="display:flex;">
@@ -109,6 +109,7 @@
           partition_id:0,
           page:1,
           limit:10,
+          keywords:"",
         },
         schedulType: 0,
         schedulArr: [
@@ -117,7 +118,7 @@
           { value: 2, label: '下午' },
           { value: 3, label: '晚上' }
         ],
-        selected_date: new Date(),
+        selected_date: "",
         partitionArr: [],
         partitionType: 0,
         tableData: [{
@@ -307,7 +308,8 @@
         this.GetDialysisgoods()
       },
       search() {
-
+        this.query.page = 1
+        this.GetDialysisgoods()
       }
     }
   }

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -102,17 +102,16 @@
           } else {
             this.tableData = []
             for (let i = 0; i < response.data.data.stock_out.length; i++) {
-              let obj = {
-                good_name: response.data.data.stock_out[i].specification_name,
-                good_type_name: response.data.data.stock_out[i].type.type_name,
-                count:this.calCount(response.data.data.stock_out[i].query_warehouseout_info)
+              if(this.calCount(response.data.data.stock_out[i].query_warehouseout_info) > 0) {
+                let obj = {
+                  good_name: response.data.data.stock_out[i].specification_name,
+                  good_type_name: response.data.data.stock_out[i].type.type_name,
+                  count: this.calCount(response.data.data.stock_out[i].query_warehouseout_info)
+                }
+                this.tableData.push(obj)
               }
-              this.tableData.push(obj)
             }
-
           }
-
-
         })
       },
 

src/xt_pages/dialysis/consumables_print.vue

@@ -96,17 +96,18 @@ export default {
           } else {
             this.tableData = []
             for (let i = 0; i < response.data.data.stock_out.length; i++) {
-              let obj = {
-                good_name: response.data.data.stock_out[i].specification_name,
-                good_type_name: response.data.data.stock_out[i].type.type_name,
-                count:this.calCount(response.data.data.stock_out[i].query_warehouseout_info)
+              if (this.calCount(response.data.data.stock_out[i].query_warehouseout_info) > 0) {
+                let obj = {
+                  good_name: response.data.data.stock_out[i].specification_name,
+                  good_type_name: response.data.data.stock_out[i].type.type_name,
+                  count: this.calCount(response.data.data.stock_out[i].query_warehouseout_info)
+                }
+                this.tableData.push(obj)
               }
-              this.tableData.push(obj)
             }
 
           }
 
-
         })
       },
         printAction: function() {

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -443,7 +443,7 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$message.success('退货成功')
+                this.$message.success('保存成功')
                 this.$router.back(-1)
               }
             })