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

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

         }
 
         if (row.advice_desc) {
-          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' + " " + row.remark
         }
 
+
+
         if (isChild == 1) {
           // 不是子药
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(8)" type="primary"-->
           <!--&gt;明细对账-->
           <!--</el-button>-->
-          <el-button v-if="this.info.prescription_status == 2" size="small" @click="open(9)" type="primary"
+          <el-button v-if="this.order.order_status == 2" size="small" @click="open(9)" type="primary"
           >结算单
           </el-button>
 
         this.loadingtwo = true
         if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
           var that = this
-          axios.get('http://127.0.0.1:9532/api/settle/get', {
+          axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form
           })
             .then(function(response) {