Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/drug/drug_stock.js

 
 export function getAllDrugStockQueryList(params) {
   return request({
-    url: '/api/stock/query',
+    url: '/api/drugstock/query',
     method: 'get',
     params: params
   })

src/xt_pages/data/components/addDrugs.vue

                   v-for="item,index in getDataConfig('hemodialysis','units')"
                   :key="index"
                   :label="item.name"
-                  :value="item.id">
+                  :value="item.name">
                 </el-option>
               </el-select>
             </el-form-item>
                   v-for="item,index in getDataConfig('hemodialysis','units')"
                   :key="index"
                   :label="item.name"
-                  :value="item.id">
+                  :value="item.name">
                 </el-option>
               </el-select>
             </el-form-item>
           <el-form-item label="标签:" prop="label">
             <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
               <el-option
-                v-for="item,index in getDictionaryDataConfig('system','sign')"
+                v-for="item,index in sign"
                 :key="index"
                 :label="item.name"
                 :value="item.id">
         formTitle: '',
         activeName: 'first',
         manufacturers:[],
-        drugCategorys: [
-          { id: 1, name: '中药' },
-          { id: 2, name: '西药' },
-          { id: 3, name: '草药' },
-          { id: 4, name: '其他' }],
+        sign: [
+          { id: 1, name: '透析模式' },
+          { id: 2, name: '特殊护理' },
+          { id: 3, name: '抗凝剂' },
+          ],
         options: [{
           value: '1',
           label: '是'

src/xt_pages/data/components/consumables.vue

         </el-select>
         <span style="color: #909399;font-size:14px;">耗材种类 : &nbsp;</span>
         <el-select v-model="good_kind" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeKind">
+          <el-option
+            label="全部"
+            value="0">
+          </el-option>
           <el-option
             v-for="item,index in  getDictionaryDataConfig('system','good_kind')"
             :key="index"

src/xt_pages/data/components/drugs.vue

           <div>{{scope.row.drug_spec}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="单位" width="60" align="center">
-
+      <el-table-column label="最小单位" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.min_unit}}</div>
         </template>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

             {{scope.row.dealers ? scope.row.dealers.dealer_name:''}}
           </template>
         </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>出库方式</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_sys == 1">{{"自动出库"}}</span>
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">

src/xt_pages/stock/drugs/drugStockUserDetail.vue

               <span >{{scope.row.count}}</span>
             </template>
           </el-table-column>
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>出库方式</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{"自动出库"}}</span>
-            </template>
-          </el-table-column>
+
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>使用时间</span>

src/xt_pages/stock/drugs/query.vue

       },
       stockInCount: function(row) {
         let total = 0;
-        for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
-          total = total + row.query_drug_warehousing_info[i].warehousing_count;
+          for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
+            total = total + row.query_drug_warehousing_info[i].warehousing_count;
         }
         return total;
       },
       salesReturnCount: function(row) {
         let total = 0;
-        for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
-          total = total + row.query_drug_sales_return_info[i].count;
+
+          for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
+            total = total + row.query_drug_sales_return_info[i].count;
         }
         return total;
       },
       stockOutCount: function(row) {
         let total = 0;
-        for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
-          total = total + row.query_drug_warehouseout_info[i].count;
+
+          for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
+            total = total + row.query_drug_warehouseout_info[i].count;
         }
         return total;
       },
       cancelStockCount: function(row) {
         let total = 0;
-        for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
-          total = total + row.query_drug_cancel_stock_info[i].count;
-        }
+          for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
+            total = total + row.query_drug_cancel_stock_info[i].count;
+          }
         return total;
       },
       showStockInDetailDialog: function(val) {},

src/xt_pages/stock/stockQuery.vue

         }
       });
     },
-    getSpecificationName: function(id) {
-      let name = "";
-      for (let i = 0; i < this.goodInfo.length; i++) {
-        if (this.goodInfo[i].id == id) {
-          name = this.goodInfo[i].specification_name;
-        }
-      }
-      return name;
-    },
-    getTypeName: function(id) {
-      let name = "";
-      for (let i = 0; i < this.goodType.length; i++) {
-        if (this.goodType[i].id == id) {
-          name = this.goodType[i].type_name;
-        }
-      }
-      return name;
-    },
+
     GetAllGoodType: function() {
       GetAllGoodType().then(response => {
         if (response.data.state == 0) {