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

src/xt_pages/Pharmacy/drugCode.vue

       </div>
     </div>
     <div style="display: flex;margin-bottom:10px;">
-     
+
       <div>上传状态:
         <el-select size="small" v-model="is_sale" placeholder="请选择" style="width:100px;" @change="changeStock">
           <el-option
 
       <el-table-column align="center" prop="name" label="结算状态" v-if="is_type == 1">
         <template slot-scope="scope">
-          
+
           <div v-if="scope.row.pre.order_status == 2">已结算</div>
           <div v-if="scope.row.pre.order_status != 2">未结算</div>
         </template>
       var that = this;
       let params = {
         id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id
+        admin_user_id: this.$store.getters.xt_user.user.id,
+        is_type:this.is_type,
       };
 
       axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
       var that = this;
       let params = {
         id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id
+        admin_user_id: this.$store.getters.xt_user.user.id,
+        is_type:this.is_type,
+
       };
       axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
         if (response.data.state == 0) {
             this.dialogVisibleOne = false
          })
       }
-     
+
     },
     getPatientName(id) {
       var name = ""
       }
       let params = {
         id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id
+        admin_user_id: this.$store.getters.xt_user.user.id,
+        is_type:this.is_type
+
       };
       axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
         if (response.data.state == 0) {

src/xt_pages/drugSourceCode/drugQuery.vue

           </template>
         </el-table-column>
       </el-table>
-      <el-table  v-if="stock_type == 5"  :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+      <el-table  v-if="stock_type == 5"  :data="tableData"  border :row-style="{ color: '#303133' }" ref="table"
                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                  max-height="600"
                  highlight-current-row>
+
+        <el-table-column align="center" prop="name" label="就诊ID">
+          <template slot-scope="scope">{{scope.row.mdtrt_id}}</template>
+        </el-table-column>
         <el-table-column align="center" prop="name" label="药品名称">
           <template slot-scope="scope">{{scope.row.MedinsListName}}</template>
         </el-table-column>

src/xt_pages/outpatientTool/components/settle.vue

     methods: {
       handleSizeChangeOne(val) {
         this.limit = val
-        this.GetRemindPatientList();
+        this.getSummarySettleList();
       },
       handleCurrentChangeOne(val) {
         this.page = val;
-        this.GetRemindPatientList();
+        this.getSummarySettleList();
       },
       getMode(id){