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

src/xt_pages/data/components/addDrugs.vue

               <el-input v-model="form.drug_spec" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="药品类型 : " prop="drug_type">
-              <el-input v-model="form.drug_type" style="width:160px;" placeholder="" maxlength="30"></el-input>
+              <el-select v-model="form.drug_type" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','drug_type')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="库存警戒:" prop="drug_stock_limit" >
               <el-input v-model="form.drug_stock_limit" style="width:160px;" placeholder="" maxlength="30"></el-input>
               <el-input v-model="form.drug_origin_place" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="药品剂型 : " prop="drug_dosage_form" >
-              <el-input v-model="form.drug_dosage_form" style="width:160px;" placeholder="" maxlength="30"></el-input>
+              <el-select v-model="form.drug_dosage_form" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','drug_dosage_form')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="医保等级 : " prop="medical_insurance_level" >
               <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">

src/xt_pages/data/components/consumables.vue

       <el-table-column prop="date" label="操作" width="300" align="center">
         <template slot-scope="scope">
           <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
-          <el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>
+          <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>

src/xt_pages/data/components/drugs.vue

       </el-table-column>
       <el-table-column label="状态" width="60" align="center">
         <template slot-scope="scope">
-          <div>{{scope.row.drug_status}}</div>
+          <div>{{scope.row.drug_status.indexOf('停用') == -1 ? '启用':'停用' }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="date" label="操作" width="400" align="center">
         <template slot-scope="scope">
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
-          <el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>
+          <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <!--<el-button type="primary" size="small" @click="clickMainTain">单位维护</el-button>-->
           <!--<el-button type="danger" size="small">删除</el-button>-->
         </template>

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()
       }