Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/stock/drugs/query.vue

         }
         return name;
       },
-      GetAllGoodType: function() {
-        GetAllGoodType().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodType.length; i++) {
-              this.goodType.push(response.data.data.goodType[i]);
-            }
-          }
-        });
-      },
-      GetAllGoodInfo: function() {
-        GetAllGoodInfo().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.goodInfo.push(response.data.data.goodInfo[i]);
-            }
-          }
-        });
-      },
+
+
       handleBack: function() {
         this.$router.go(-1);
       },
       handleSizeChange(val) {
         this.limit = val;
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },
       handleCurrentChange(val) {
         this.page = val;
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100;
       },
       startTimeChange: function() {
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },
       endTimeChange: function() {
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },
       stockInCount: function(row) {
         let total = 0;
       showStockOutDetailDialog: function() {},
       showCancelStockDetailDialog: function() {},
       search: function() {
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },setting:function() {
         this.$refs.dialog.show()
       }