bug修改

src/api/stock.js

@@ -56,6 +56,7 @@ export function modifyManufacturer(params) {
   })
 }
 
+
 export function getManufacturerList(params) {
   return request({
     url: '/api/stock/manufacturer/list',
@@ -993,3 +994,19 @@ export function getGoodDetailSummary(params) {
     params: params
   })
 }
+
+export function getdealername(params) {
+  return request({
+    url: '/api/stock/dealer/getdealername',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getmanufacturername(params) {
+  return request({
+    url: '/api/stock/manufacturer/getmanufacturername',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/DepositManagement/DepositRefund.vue

@@ -396,7 +396,7 @@ export default {
     // 审核通过
     pass_exam() {
       if(this.multipleSelection.length < 1){
-        alert("未选择任何信息")
+        this.$message.error("未选择任何信息")
         return
       }
       var tmp = "";
@@ -422,7 +422,7 @@ export default {
     // 审核拒绝
     reject_exam() {
       if(this.multipleSelection.length < 1){
-        alert("未选择任何信息")
+        this.$message.error("未选择任何信息")
         return
       }
       var tmp = "";

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -873,6 +873,8 @@
     methods: {
       //调试
       lili(index,row){
+        // console.log("==index==",index)
+        // console.log("==row==",row)
         console.log("==doctor_advices==",this.doctor_advices)
         console.log("==this.form==",this.form)
       },
@@ -988,6 +990,8 @@
       },
       submitEditAdvice() {
         // console.log()
+        console.log("保存22222222222222")
+        console.log("==this.src_type==",this.src_type)
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
@@ -1021,7 +1025,6 @@
               this.showAdviceForm = false
               this.showAdvicePanel = true
               var advice = response.data.data.advice
-              console.log("advic323323232323232",advice)
               this.doctor_advices[this.currentIndex].drug_spec = advice.drug_spec
               this.doctor_advices[this.currentIndex].drug_spec_unit =
                 advice.drug_spec_unit
@@ -1347,7 +1350,6 @@
                     }
                   }
                   this.execTimeDialogVisible = false
-                  
                   return false
               }
 
@@ -1412,7 +1414,7 @@
               this.hideForm()
               console.log("子药23223332323332",this.form.parent_id)
               console.log("232322332323232",this.form.parent_id)
-           
+
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
                 for (let index = this.doctor_advices.length - 1; ; index--) {
@@ -1436,7 +1438,7 @@
                       this.doctor_advices.push(swapData[index])
                     }
                   }
-                 
+
                   console.log("doctore_advic4233232323232",this.doctor_advices)
                 }
               } else {

src/xt_pages/stock/config/dealer.vue

@@ -1,4 +1,5 @@
 <template>
+<!--  专用字典中的经销商-->
   <div class=" sign-and-weigh-box" style="background: white">
     <manufacturer-or-dealer-dialog
       ref="dialog"
@@ -16,6 +17,24 @@
         <!--<el-button type="primary" style="float:right;"  @click="showDialog">新增经销商</el-button>-->
 
         <div>
+
+          <el-select v-model="key" clearable filterable placeholder="请输入经销商名称" @change="handleSelect" ><!--@change="updateconfig1(h1)"-->
+            <el-option
+              v-for="item in namelist"
+              :key="item.id"
+              :label="item.dealer_name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >查询</el-button>
+
           <el-button
             size="small"
             icon="el-icon-circle-plus-outline"
@@ -134,7 +153,8 @@ import {
   modifyDealer,
   getDealersList,
   deleteDealer,
-  GetDealer
+  GetDealer,
+  getdealername
 } from "@/api/stock";
 
 export default {
@@ -144,6 +164,8 @@ export default {
   name: "dealer",
   data() {
     return {
+      key:"",
+      namelist:[],
       thedefaultActive: "1-2",
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       dealerData: [],
@@ -191,6 +213,44 @@ export default {
     };
   },
   methods: {
+    //初始化供应商列表
+    init(){
+      // alert("!!!")
+      this.key = ""
+      var params = {}
+      getdealername(params).then(res => {
+        if (res.data.state == 1){
+          this.namelist = res.data.data.list
+        }
+      })
+    },
+    handleSelect(){
+      // this.key = val.id
+      console.log("this.key",this.key)
+    },
+    search(){
+      let params = {
+        page: this.page,
+        limit: this.limit,
+        key: this.key
+      };
+      this.loading = true;
+      getDealersList(params).then(response => {
+        if (response.data.state == 0) {
+          this.loading = false;
+
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.loading = false;
+          this.total = response.data.data.total;
+          this.dealerData = [];
+          for (let i = 0; i < response.data.data.dealer.length; i++) {
+            this.dealerData.push(response.data.data.dealer[i]);
+          }
+        }
+      });
+    },
     handleEdit: function(index, row) {
       this.editId = row.id;
       this.editIndex = index;
@@ -392,6 +452,7 @@ export default {
   },
   created() {
     this.getList();
+    this.init();
   }
 };
 </script>

src/xt_pages/stock/config/manufacturer.vue

@@ -1,4 +1,5 @@
 <template>
+<!--  专用字典的生产厂家-->
   <div class="main-contain">
     <div class=" sign-and-weigh-box" style="background: white">
       <manufacturer-or-dealer-dialog
@@ -15,6 +16,24 @@
       <el-row :gutter="15">
         <el-col>
           <div>
+
+            <el-select v-model="key" clearable filterable placeholder="请输入生产厂商名称" @change="handleSelect" ><!--@change="updateconfig1(h1)"-->
+              <el-option
+                v-for="item in namelist"
+                :key="item.id"
+                :label="item.manufacturer_name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              icon="el-icon-search"
+              @click="search"
+            >查询</el-button>
+
             <el-button
               size="small"
               icon="el-icon-circle-plus-outline"
@@ -131,7 +150,8 @@ import {
   deleteManufacturer,
   GetManufacturer,
   getManufacturerList,
-  modifyManufacturer
+  modifyManufacturer,
+  getmanufacturername
 } from "@/api/stock";
 
 export default {
@@ -141,6 +161,8 @@ export default {
   name: "manufacturer",
   data() {
     return {
+      key:"",
+      namelist:[],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       manufacturerData: [],
       total: 0,
@@ -188,6 +210,39 @@ export default {
     };
   },
   methods: {
+    //初始化供应商列表
+    init(){
+      // alert("!!!")
+      this.key = ""
+      var params = {}
+      getmanufacturername(params).then(res => {
+        if (res.data.state == 1){
+          this.namelist = res.data.data.list
+        }
+      })
+    },
+    search(){
+      let params = {
+        page: this.page,
+        limit: this.limit,
+        key: this.key
+      };
+      this.loading = true;
+      getManufacturerList(params).then(response => {
+        if (response.data.state == 0) {
+          this.loading = false;
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.loading = false;
+          this.total = response.data.data.total;
+          this.manufacturerData = [];
+          for (let i = 0; i < response.data.data.manufacturer.length; i++) {
+            this.manufacturerData.push(response.data.data.manufacturer[i]);
+          }
+        }
+      });
+    },
     handleEdit: function(index, row) {
       this.editId = row.id;
       this.editIndex = index;
@@ -394,6 +449,7 @@ export default {
   },
   created() {
     this.getList();
+    this.init();
   }
 };
 </script>

src/xt_pages/user/doctorAdvice.vue

@@ -671,7 +671,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="开药数量!"
+                  label="开药数量"
                   min-width="80"
                   property="prescribing_number"
                   align="center"
@@ -690,10 +690,32 @@
                   align="center"
                 >
                   <template slot-scope="scope">
-                    <span v-if="scope.row.single_dose != 0"
-                      >{{ scope.row.single_dose
-                      }}{{ scope.row.single_dose_unit }}</span
-                    >
+<!--                    <span v-if="scope.row.single_dose != 0">{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>-->
+                    <span v-if="scope.row.single_dose != 0">
+<!--                    {{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}-->
+                    <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
+                    <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
+                    <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
+                    <span v-else-if="scope.row.single_dose_unit == 4" >{{ scope.row.single_dose}}ml</span>
+                    <span v-else-if="scope.row.single_dose_unit == 5" >{{ scope.row.single_dose}}万U</span>
+                    <span v-else-if="scope.row.single_dose_unit == 6" >{{ scope.row.single_dose}}枚</span>
+                    <span v-else-if="scope.row.single_dose_unit == 7" >{{ scope.row.single_dose}}粒</span>
+                    <span v-else-if="scope.row.single_dose_unit == 8" >{{ scope.row.single_dose}}片</span>
+                    <span v-else-if="scope.row.single_dose_unit == 9" >{{ scope.row.single_dose}}支</span>
+                    <span v-else-if="scope.row.single_dose_unit == 10" >{{ scope.row.single_dose}}ug</span>
+                    <span v-else-if="scope.row.single_dose_unit == 11" >{{ scope.row.single_dose}}iu</span>
+                    <span v-else-if="scope.row.single_dose_unit == 12" >{{ scope.row.single_dose}}包</span>
+                    <span v-else-if="scope.row.single_dose_unit == 13" >{{ scope.row.single_dose}}袋</span>
+                    <span v-else-if="scope.row.single_dose_unit == 14" >{{ scope.row.single_dose}}万</span>
+                    <span v-else-if="scope.row.single_dose_unit == 15" >{{ scope.row.single_dose}}万iu</span>
+                    <span v-else-if="scope.row.single_dose_unit == 16" >{{ scope.row.single_dose}}丸</span>
+                    <span v-else-if="scope.row.single_dose_unit == 17" >{{ scope.row.single_dose}}盒</span>
+                    <span v-else-if="scope.row.single_dose_unit == 18" >{{ scope.row.single_dose}}瓶</span>
+                    <span v-else-if="scope.row.single_dose_unit == 19" >{{ scope.row.single_dose}}瓶(袋)</span>
+                    <span v-else-if="scope.row.single_dose_unit == 20" >{{ scope.row.single_dose}}次</span>
+                    <span v-else >{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>
+                  </span>
+
                   </template>
                 </el-table-column>
                 <el-table-column