Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/role/admin.js

@@ -320,6 +320,15 @@ export function toCheckPDFInformation(params){
   })
 }
 
+export function toAutoDrug(params){
+  
+  return request({
+    url:"/api/device/toautodrug",
+    method:"get",
+    params:params
+  })
+}
+
 // export function getdruginfoInformation(params){
 
 //    return request({

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1630,7 +1630,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10580){
+      if(this.$store.getters.xt_user.org.id == 10580 || this.$store.getters.xt_user.org.id == 10585){
         var year = date.getFullYear()
           var month = date.getMonth() + 1
           var day = date.getDate()

src/xt_pages/outpatientTool/components/settle.vue

@@ -139,6 +139,22 @@
           <template slot-scope="scope">{{scope.row.cvlserv_pay.toFixed(2)}}</template>
         </el-table-column>
 
+        <el-table-column align="center" prop="wechat_pay" label="发票号码">
+          <template slot-scope="scope" style="width: 100px">
+            <el-input v-model="scope.row.fa_piao_number" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
+            <el-button size="small" @click="change(scope.row.id,scope.row.fa_piao_number,'fa_piao_number')">修改</el-button>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column align="center" prop="wechat_pay" label="发票编号">
+          <template slot-scope="scope" style="width: 100px">
+            <el-input v-model="scope.row.fa_piao_code" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
+            <el-button size="small" @click="change(scope.row.id,scope.row.fa_piao_code,'fa_piao_code')">修改</el-button>
+          </template>
+        </el-table-column>
+
+
         <el-table-column align="center" prop="wechat_pay" label="微信支付">
           <template slot-scope="scope" style="width: 100px">
             <el-input v-model="scope.row.wechat_pay" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
@@ -284,6 +300,17 @@
         <template slot-scope="scope">{{scope.row.cvlserv_pay.toFixed(2)}}</template>
       </el-table-column>
 
+
+
+      <el-table-column align="center" prop="wechat_pay" label="发票号码">
+        <template slot-scope="scope">{{scope.row.fa_piao_number}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="wechat_pay" label="发票编号">
+        <template slot-scope="scope">{{scope.row.fa_piao_code}}</template>
+      </el-table-column>
+
+
       <el-table-column align="center" prop="wechat_pay" label="微信支付">
         <template slot-scope="scope">{{scope.row.wechat_pay}}</template>
 

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">加班</el-button>
+          @click="toJiaBan">加班</el-button> -->
        
 
          <!-- <el-button
@@ -209,6 +209,12 @@
           @click="toCheckPDFInformation">PDF验证</el-button> -->
 
 
+          <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toAutoDrug">自动生成</el-button>
 
 
      </div>
@@ -516,7 +522,7 @@
 
 <script>
 import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail
-  ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation,toCheckPDFInformation,getdruginfoInformation} from "@/api/role/admin";
+  ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation,toCheckPDFInformation,getdruginfoInformation,toAutoDrug} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 import { UploadPrintOrder } from "@/api/role/admin"
 import { parseTime } from "@/utils";
@@ -1174,6 +1180,11 @@ export default {
 
         }
       })
+    },
+    toAutoDrug(){
+      toAutoDrug().then(Response=>{
+
+      })
     }
 
   },