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

@@ -382,9 +382,9 @@
           {value: 11, label: "普通门诊"},
           {value: 12, label: '门诊挂号'},
           {value: 13, label: "急诊"},
-          {value: 14, label: "门诊慢性病"},
+          {value: 14, label: "门诊特殊病"},
           {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊特殊病"},
+          {value: 16, label: "门诊慢性病"},
           {value: 21, label: "普通住院"},
 
         ],
@@ -453,6 +453,22 @@
         this.prescriptions = []
         this.prescriptions = val
         for (let i = 0; i < this.prescriptions.length; i++) {
+          var nowDate = new Date()
+          var nowYear = nowDate.getFullYear()
+          var nowMonth = nowDate.getMonth() + 1
+          var nowDay = nowDate.getDate()
+
+          var hours = nowDate.getHours()
+          var min = nowDate.getMinutes()
+
+          var nowTime =
+            nowYear +
+            '-' +
+            (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+            '-' +
+            (nowDay < 10 ? '0' + nowDay : nowDay) + " "+(hours < 10 ? '0' + hours : hours) +
+            ':' + (min < 10 ? '0' + min : min)
+          this.prescriptions[i]['pre_time'] = nowTime
           this.prescriptions[i].name = "处方" + (i + 1)
           if (i == 0) {
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
@@ -1057,7 +1073,7 @@
 
       },
       addTab(targetName) {
-        if (this.curPrescriptions.order_status >= 2) {
+        if (this.curPrescriptions.order_status == 2) {
           this.$message.error('该处方已经结算或者退费，无法继续添加处方')
           return
         }
@@ -1282,8 +1298,8 @@
         this.curDrugs = selection
       },
       comfirm() {
-        if (this.curPrescriptions.order_status >= 2) {
-          this.$message.error('该处方已经结算或者退费，无法继续添加药品或者项目')
+        if (this.curPrescriptions.order_status == 2) {
+          this.$message.error('该处方已经结算，无法继续添加药品或者项目')
           this.teamList = []
           this.curDrugs = []
           this.tempDrugs = []

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -221,7 +221,7 @@
      },
      delAddition(index, addition){
        if(this.prescription.order_status == 2){
-         this.$message.error('该处方已经结算或者退费，无法删除')
+         this.$message.error('该处方已经结算，无法删除')
          return
        }
        this.$confirm("附加费删除后不可恢复，是否确认删除", "删除", {
@@ -267,7 +267,7 @@
 
       },deleteDrug:function(index, row){
        if(this.prescription.order_status == 2){
-         this.$message.error('该处方已经结算或者退费，无法删除')
+         this.$message.error('该处方已经结算，无法删除')
          return
        }
        this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
@@ -343,7 +343,7 @@
       },
       deleteProject(row,i){
         if(this.prescription.order_status == 2){
-          this.$message.error('该处方已经结算或者退费，无法删除')
+          this.$message.error('该处方已经结算，无法删除')
           return
         }
         this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {