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

src/xt_pages/Pharmacy/drugCode.vue

@@ -46,6 +46,19 @@
         </div>
       </div>
 
+      <div>
+        <div>结算状态:
+          <el-select size="small" v-model="is_settle" placeholder="请选择" style="width:100px;" @change="changeSettle">
+            <el-option
+              v-for="item,index in settle_items"
+              :key="index"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+
       <div>
         <el-button type="primary" @click="batchUpload()">批量上传</el-button>
         <el-button type="primary" @click="query()">查询</el-button>
@@ -103,6 +116,14 @@
         </template>
       </el-table-column>
 
+
+      <el-table-column align="center" prop="name" label="结算状态">
+        <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>
+      </el-table-column>
+
       <el-table-column align="center" prop="name" label="操作" width="200">
         <template slot-scope="scope">
           <div>
@@ -119,13 +140,14 @@
 
 
     </el-table>
-    
+
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :page-size="10"
       :page-sizes="[10, 20, 50, 100,500,1000,2000]"
       background
+      layout="total, sizes, prev, pager, next, jumper"
       style="margin-top:20px;float: right"
       :total="total"
     ></el-pagination>
@@ -176,7 +198,7 @@ export default {
       drugTypeList: [{id: 0, name: "全部"}],
       start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
       end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
-
+      is_settle:"0",
       tableData: [],
       change_type: "3",
       selection: [],
@@ -189,6 +211,11 @@ export default {
         {id: "1", name: '已上传'},
         {id: "2", name: '未上传'},
       ],
+      settle_items: [
+        {id: "0", name: '全部'},
+        {id: "2", name: '已结算'},
+        {id: "1", name: '未结算'},
+      ],
       patientList: [],
       drugList: [],
       dialogVisibleOne: false,
@@ -567,6 +594,7 @@ export default {
         page: this.page,
         limit: this.limit,
         is_sale: this.is_sale,
+        is_settle:this.is_settle,
 
       }
       getHisDrugCodeQueryList(params).then(response => {
@@ -582,6 +610,10 @@ export default {
           this.is_open = response.data.data.codeConfig.is_open
         }
       })
+    },changeSettle(val){
+
+      this.is_settle = val
+      this.getlist()
     },
     changeStock(val) {
       this.is_sale = val

src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue

@@ -412,7 +412,7 @@ export default {
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
             
-              if(this.org_id == 0 || this.org_id == 10644){
+              if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].drugAddPrice = ""
                 list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               }else{

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))