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

src/xt_pages/data/components/consumables.vue

@@ -43,8 +43,8 @@
     </div>
 
      <div style="display:flex; align-items:center;margin-bottom:10px;">
-        <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
-        <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
+        <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">批量备案</el-button>
+        <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028 && $store.getters.xt_user.org_id != 10138" @click="GDYBBatchPutOnRecord">批量备案</el-button>
         <el-link target="_blank" href="https://kuyi.shengws.com/stockTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -130,7 +130,7 @@
           <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">
              <span v-if="scope.row.is_mark == 0">备案</span>
              <span v-if="scope.row.is_mark == 1">撤销</span>
           </el-button>

src/xt_pages/data/components/drugs.vue

@@ -45,8 +45,8 @@
 
     </div>
     <div style="display:flex; align-items:center;margin-bottom:10px;">
-        <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
-        <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
+        <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
+        <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028  && $store.getters.xt_user.org_id != 10138 && $store.getters.xt_user.org_id != 10138" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
         <el-link target="_blank" href="https://kuyi.shengws.com/drugTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -147,13 +147,13 @@
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
           <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>
 
-        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >
+        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138" >
           <span v-if="scope.row.is_mark == 0">备案</span>
           <span v-if="scope.row.is_mark == 1">撤消</span>
         </el-button>
 
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028 && $store.getters.xt_user.org_id != 10138">
             <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
             <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
           </el-button>
@@ -734,6 +734,7 @@
             return false
           } else {
             this.total = response.data.data.total;
+            console.log("total22222",total)
             this.list = [];
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])

src/xt_pages/data/components/project.vue

@@ -114,12 +114,12 @@
                 <template slot-scope="scope">
                     <el-button @click="editHisProject(scope.row.id)" type="primary" size="small">编辑</el-button>
                     <el-button type="danger" size="small" @click="deleteProject(scope.row.id,scope.$index)">删除</el-button>
-                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">
                       <span v-if="scope.row.is_mark ==0">备案</span>
                       <span v-if="scope.row.is_mark ==1">撤销</span>
                     </el-button>
 
-                    <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028 && $store.getters.xt_user.org_id != 10138">
                         <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
                         <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
                     </el-button>

src/xt_pages/hospitalStation/index.vue

@@ -628,7 +628,7 @@
     },
     created() {
 
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 10138) {
         this.form.certificates = 2;
         this.form.id_card_type = 1
       } else {

src/xt_pages/hospitalStation/newStatementPrintTwo.vue

@@ -86,7 +86,7 @@
 
       },
       getInfo(obj) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
           var that = this;
           axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
             params: obj

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -581,7 +581,7 @@
         form['patient_id'] = this.patientInfo.id;
         form['admin_user_id'] = this.$store.getters.xt_user.user.id;
         form['order_id'] = this.order.id;
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
           var that = this;
           axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
             params: form
@@ -696,7 +696,7 @@
         this.loadingone = true;
 
         var that = this;
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
             headers: {
@@ -787,7 +787,7 @@
 
         var that = this;
 
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
 
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,

src/xt_pages/hospitalStation/summary.vue

@@ -100,7 +100,7 @@
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
             <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                       v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || ($store.getters.xt_user.org_id == 9990) ">
+                       v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || ($store.getters.xt_user.org_id == 9990) ">
               结算单
             </el-button>
             <el-button size="mini" type="primary" @click="toRefund(scope.row)"
@@ -499,7 +499,7 @@
         }
       },
       toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138)){
           this.statementVisible9504 = true;
           let obj = {
             order_id: row.id,

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div id='prescription-print' class="prescription-print">
-            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028">
+            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138">
                 <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
                 <div class="infoMain">
                     <div class="infoP">医院(药店)编号：{{org_code}}</div>
@@ -346,7 +346,7 @@
     },
     created() {
 
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
         this.orgname = xtuser.org.org_name;
         var form = {
           'order_id': this.paramsObj.order_id,

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -86,7 +86,7 @@
 
       },
       getInfo(obj) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
           var that = this;
           axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
             params: obj

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -57,7 +57,7 @@
             <div class="mainRight">
 
                 <div class="mainCell fixedCell" style="margin-bottom:10px;">
-                    <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028">
+                    <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138">
                         <el-button v-loading="loadingone" size="small"
                                    @click="sz_open(1)"
                                    type="primary">挂号
@@ -107,7 +107,7 @@
                     <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button> -->
 
 
-                    <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 10028">
+                    <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 10028 && this.$store.getters.xt_user.org_id != 10138">
                         <el-button size="small" @click="open(3)" type="primary">打印</el-button>
                         <el-button v-loading="loadingone" size="small"
                                    @click="open(6)"
@@ -618,7 +618,7 @@
 
         }
 
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10138) {
           var that = this
           axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
             params: form
@@ -734,7 +734,7 @@
         this.loadingone = true;
 
         var that = this
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id ==  10138) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
             headers: {
@@ -879,7 +879,7 @@
 
         var that = this
 
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 ||this.$store.getters.xt_user.org_id == 10138) {
 
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,

src/xt_pages/outpatientCharges/summary.vue

@@ -103,7 +103,7 @@
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
             <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                       v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
+                       v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138)  || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
               结算单
             </el-button>
             <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
@@ -359,7 +359,7 @@
         }
       },
       toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
           this.statementVisible9504 = true;
           let obj = {
             order_id: row.id,

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div id='prescription-print' class="prescription-print">
-            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028">
+            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138">
                 <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
                 <div class="infoMain">
                     <div class="infoP">医院(药店)编号：{{org_code}}</div>
@@ -346,7 +346,7 @@
     },
     created() {
 
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
         this.orgname = xtuser.org.org_name;
         var form = {
           'order_id': this.paramsObj.order_id,

src/xt_pages/outpatientCharges/treatTemplate/printTwo.vue

@@ -27,7 +27,7 @@
                     <td width="70">总额</td>
                     <td width="100">小计</td>
                 </tr>
-                <tr v-for="(item,y) in prescription[0].advices" :key="y"> 
+                <tr v-for="(item,y) in prescription[0].advices" :key="y">
                     <td></td>
                     <td>{{item.advice_name}}</td>
                     <td>{{item.advice_desc}}</td>
@@ -36,7 +36,7 @@
                     <td>{{item.price}}</td>
                     <td>{{ item.single_dose * item.price }}</td>
                     <td>{{ item.single_dose * item.price }}</td>
-                    
+
                 </tr>
                 <tr>
                     <td colspan="2">药品费：0.00元</td>
@@ -50,7 +50,7 @@
                             <div style="width:33%;">医疗费总额：</div>
                             <div style="width:33%;">基金支付金额：</div>
                             <div style="width:33%;">个人账户支付金额：</div>
-                            
+
                         </div>
                         <div style="display:flex;flez-wrap:wrap;">
                             <div style="width:33%;">个人支付金额：</div>
@@ -234,7 +234,7 @@
     },
     created() {
 
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
         this.orgname = xtuser.org.org_name;
         var form = {
           'order_id': this.paramsObj.order_id,

src/xt_pages/outpatientRegistration/index.vue

@@ -3,7 +3,7 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028"
+        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138"
              class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
@@ -948,7 +948,7 @@
             params['admin_user_id'] = this.$store.getters.xt_user.user.id
             this.loadingone = true
 
-            if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+            if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 100138) {
               var that = this
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {
                 params: params,
@@ -1213,7 +1213,7 @@
               params['admin_user_id'] = this.$store.getters.xt_user.user.id;
             this.loadingone = true;
 
-            if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+            if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
               var that = this;
 
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {
@@ -1450,7 +1450,7 @@
 
     },
     created() {
-      if(this.$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10028){
+      if(this.$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 10138){
         this.form.certificates = 2;
         this.form.id_card_type = 1
       }else{

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -3,7 +3,7 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028"
+        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138"
              class="app-container">
             <div class="cell clearfix">
                 <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->

src/xt_pages/stock/drugs/query.vue

@@ -191,7 +191,6 @@
   export default {
     name: 'stockIn',
     created() {
-      //  this.GetAllDrugStockQueryList()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
@@ -346,11 +345,13 @@
       },
       handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        // this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        // this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
@@ -363,7 +364,8 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        // this.GetAllDrugStockQueryList();
+        this.getlist()
       }
     },
     endTimeChange: function(val) {
@@ -372,7 +374,8 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        // this.GetAllDrugStockQueryList();
+        this.getlist()
       }
      
     },
@@ -415,7 +418,8 @@
       showCancelStockDetailDialog: function() {
       },
       search: function() {
-        this.GetAllDrugStockQueryList()
+        // this.GetAllDrugStockQueryList()
+        this.getlist()
       }, 
       setting: function() {
         this.$refs.dialog.show()
@@ -447,7 +451,8 @@
         return (new Date(time)).getTime() / 1000
       },
       changeDrug(){
-       this.GetAllDrugStockQueryList()
+     
+      this.getlist()
       },
       printOrder(){
         this.$router.push({
@@ -466,13 +471,14 @@
           start_time:this.start_time,
           end_time:this.end_time,
         }
-       
+        
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
              var list = response.data.data.list
-             console.log("list",list)
+             console.log("list99999",list)
              this.tableList = list
              var total = response.data.data.total
+             console.log("total",total)
              this.total = total
              this.manufacturerList = response.data.data.manufacturerList
            

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -476,8 +476,8 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            console.log("9999999",stockOut)
-            return
+            
+           
             editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/stock/stockQuery.vue

@@ -46,7 +46,7 @@
             style="width: 200px;margin-left:10px;"
             class="filter-item"
             v-model.trim="keywords"
-            placeholder="耗材名称/商品编码/商品名称/规格名称"
+            placeholder="耗材名称"
           />
           <el-button
             size="small"
@@ -288,7 +288,7 @@ export default {
       },
       options:[],
       value:"",
-      type_name:"",
+      type_name:0,
       types:[],
       tableList:[],
       manufacturerList:[]
@@ -391,12 +391,11 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-      // this.GetAllStockQuery();
+     
       this.getlist()
     },
     handleCurrentChange(val) {
       this.page = val;
-      // this.GetAllStockQuery();
        this.getlist()
     },
     calculate: function(val) {
@@ -410,7 +409,6 @@ export default {
         this.start_time = "";
       } else {
         this.start_time = val
-        // this.GetAllStockQuery();
          this.getlist()
       }
     },
@@ -421,7 +419,6 @@ export default {
         this.end_time = "";
       } else {
         this.end_time = val
-        // this.GetAllStockQuery();
          this.getlist()
       }
      
@@ -460,7 +457,6 @@ export default {
     showStockOutDetailDialog: function() {},
     showCancelStockDetailDialog: function() {},
     search: function() {
-      // this.GetAllStockQuery();
       this.getlist()
     },
 
@@ -519,18 +515,20 @@ export default {
       const params = {
         page: this.page,
         limit: this.limit,
-        keyword: this.keywords,
+        keywords: this.keywords,
         start_time:this.start_time,
         end_time:this.end_time,
         type_name:this.type_name,
       };
-
+     console.log("params",params)
       getAllStockList(params).then(response=>{
          if(response.data.state == 1){
           var list = response.data.data.list
           console.log("list22222",list)
           this.tableList = list
           var total = response.data.data.total
+          console.log("total",total)
+          this.total = total
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
          }