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

src/api/his/his.js

 }
 
 export function createHisPrescription(data, params) {
+  console.log('param2323232323233223233223332322323', params)
   return request({
     url: '/api/hisprescription/create',
     method: 'post',
   })
 }
 
-
 export function GetLabelList(params) {
   return request({
     url: '/api/his/inspectionlist/get',
   })
 }
 
-
-
 export function GetLabelInfo(params) {
   return request({
     url: '/api/his/inspectioninfo/get',

src/xt_pages/hospitalStation/components/deskPrescription.vue

             isLoading = true
             console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
             let num = 0
-            this.prescriptions.map(item => {
-              if (item.advices.length > 0) {
-                item.advices.map(it => {
-                  if (it.drug.total <= 0) {
-                    num++
-                    setTimeout(() => {
-                      this.$message.error(it.drug.drug_name + '库存不足')
-                    }, 100)
-                  }
-                })
-              }
-            })
+            // this.prescriptions.map(item => {
+            //   if (item.advices.length > 0) {
+            //     item.advices.map(it => {
+            //       if (it.drug.total <= 0) {
+            //         num++
+            //         setTimeout(() => {
+            //           this.$message.error(it.drug.drug_name + '库存不足')
+            //         }, 100)
+            //       }
+            //     })
+            //   }
+            // })
             if (num == 0) {
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

             isLoading = true
             console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
             let num = 0
-            this.prescriptions.map(item => {
-              if (item.advices.length > 0) {
-                item.advices.map(it => {
-                  if (it.drug.total <= 0) {
-                    num++
-                    setTimeout(() => {
-                      this.$message.error(it.drug.drug_name + '库存不足')
-                    }, 100)
-                  }
-                })
-              }
-            })
+            // this.prescriptions.map(item => {
+            //   if (item.advices.length > 0) {
+            //     item.advices.map(it => {
+            //       if (it.drug.total <= 0) {
+            //         num++
+            //         setTimeout(() => {
+            //           this.$message.error(it.drug.drug_name + '库存不足')
+            //         }, 100)
+            //       }
+            //     })
+            //   }
+            // })
             if (num == 0) {
+             
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)

src/xt_pages/stock/inventory.vue

                 this.dealerList = dealer
                 for(let i=0;i<this.goodList.length;i++){
                     for(let j=0;j<this.manufacturerList.length;j++){
-                    if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-                        this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-                    }
+                      if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                          this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                      }
                     }
                 }
 
               list[i].type = 6
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
+              list[i].manufacturer_name = ""
               for(let j=0;j<this.manufacturerList.length;j++){
                 if(list[i].manufacturer == this.manufacturerList[j].id){
                   list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

src/xt_pages/workforce/remind_print_setting.vue

                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 7">
-                    {main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 8">
                      {{main_collection.dialysissolution.anticoagulant_zongliang}}iu