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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

             //   }
             // })
             if (num == 0) {
-             
+
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)
           this.$message.error('该处方已经结算，无法删除')
           return
         }
-        if (targetName == '处方1') {
-          this.$message.error('该处方无法删除')
-          return
-        }
         this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

             var drugs = response.data.data.drugs
             for(let i=0;i<drugs.length;i++){
                 drugs[i].count = 0
-              if(drugs[i].stock_in.length > 0){
-                if(drugs[i].stock_in != null) {
+              if(drugs[i].stock_in != null) {
+                if(drugs[i].stock_in.length > 0){
                   for (let j = 0; j < drugs[i].stock_in.length; j++) {
                     drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
                   }

src/xt_pages/outpatientTool/labelPrint.vue

         this.current_project_name = row.project_name
         this.current_name = row.patient_name
         this.$nextTick(() => {
-          JsBarcode('#barcode',row.p_project_id, {
+          JsBarcode('#barcode',row.id, {
             format: 'CODE39',
             lineColor: '#000',
             background: '#EBEEF5',