Merge remote-tracking branch 'origin/dev_20240306' into dev_ksck

src/api/inout/ioDepartmentOrder.js

@@ -0,0 +1,17 @@
+import axios from '@/utils/request'
+
+export function getSkSickerList(data) {
+  return axios({
+    url: "/udiwms/inout/ioDepartmentOrder/getSkSickerList",
+    method: "post",
+    data: data
+  });
+}
+
+export function getOrderListbyCode(data) {
+  return axios({
+    url: "/udiwms/inout/ioDepartmentOrder/getOrderListbyCode",
+    method: "get",
+    data: data
+  });
+}

src/components/inout/baziPanel.vue

@@ -0,0 +1,63 @@
+<template>
+  <el-card :body-style="{margin:'20px'}"
+           style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px"
+  >
+    <template #header>
+      <el-form class="query-form" size="mini">
+          <el-form-item class="query-form-item"  label-width="25%" label="姓 名:">
+            <el-input
+              v-model="info.name"
+              placeholder="请输入姓名"
+              clearable
+              disabled
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item class="query-form-item" label-width="25%" label="住院号:">
+            <el-input
+              v-model="info.adNum"
+              placeholder="请输入住院号"
+              clearable
+              disabled
+            >
+            </el-input>
+          </el-form-item>
+
+        <el-form-item>
+          <el-button-group>
+            <el-button type="primary" @click="onCodeSubmit"
+                       icon="el-icon-search"
+            >处理单据
+            </el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+    </template>
+
+  </el-card>
+</template>
+<script>
+
+export default {
+  name: '',
+  data() {
+    return {
+      info:{}
+    }
+  },
+  props: {
+    info: Object
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    onCodeSubmit(){
+      this.$emit('baziPanel',this.info)
+    }
+  },
+  computed: {}
+}
+</script>

src/views/inout/DialogCreateOrder.vue

@@ -675,6 +675,10 @@ export default {
       type: Object,
       required: true,
     },
+    sickerAdNum: {
+      type: Object,
+      required: true,
+    },
     viewType: {
       //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面,4.待配货页面,5:有三期验收,6:无三期验收；7.待校验页面
       type: Object,
@@ -1794,6 +1798,7 @@ export default {
       this.viewBizVisible = true;
     }
     this.orderFormData.orderType = this.viewType;
+    this.orderFormData.sickerAdNum = this.sickerAdNum;
     this.getConfig();
     if (this.$isNotBlank(this.orderQuery.billNo)) {
       //编辑页面
@@ -1826,6 +1831,10 @@ export default {
       this.orderFormData.deptCode = this.$store.getters.deptCode;
       this.orderFormData.invCode = this.$store.getters.locInvCode;
       this.findInvListByUser();
+      if (this.orderFormData.sickerAdNum != null){
+        this.findSickMethod(this.orderFormData.sickerAdNum)
+        this.orderFormData.fromCorp = sickerAdNum
+      }
 
     }
   },

src/views/inout/IoDepartmentOrder.vue

@@ -0,0 +1,188 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="患者信息:">
+              <el-input v-model="filterQuery.name" placeholder="请输入患者信息"
+                        style="width: 90%"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </div>
+    </el-card>
+    <el-divider style="margin: 15px"></el-divider>
+    <el-card class="el-card">
+
+      <el-row>
+        <el-col :span="4" v-for="(bazi,key) in list" :key="key" class="text-center">
+          <BaziPanel :info="bazi" @baziPanel="getValue"></BaziPanel>
+        </el-col>
+      </el-row>
+      <pagination style="height: 20px"
+                  v-show="total>0"
+                  :total="total"
+                  :page-sizes=[12,24,48]
+                  :page.sync="filterQuery.page"
+                  :limit.sync="filterQuery.limit"
+                  @pagination="getList"
+      />
+    </el-card>
+    <el-dialog
+      :title=title
+      :visible.sync="addOrderVisible"
+      width="85%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addOrderVisible"
+      @close="closeDialog"
+    >
+      <addOrder
+        :closeDialog="closeDialog"
+        :orderQuery="idQuery"
+        :sickerAdNum="sickerAdNum"
+        :viewType="2"
+        :errView="0"
+      ></addOrder>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+import BaziPanel from '@/components/inout/baziPanel.vue'
+import { getSkSickerList,getOrderListbyCode } from '@/api/inout/ioDepartmentOrder'
+import addOrder from "@/views/inout/DialogCreateOrder";
+
+export default {
+  components: { BaziPanel,addOrder },
+  name: 'IoDepartmentOrder',
+  data() {
+    return {
+      title:"新增单据",
+      resultQuery: {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 12
+      },
+      total: 0,
+      list: [],
+      showSearch: true,
+      filterQuery: {
+        name: '',
+        page: 1,
+        limit: 12
+
+      },
+      sickerAdNum:"",
+      addOrderVisible: false,
+      idQuery:{
+        billNo: null,
+        corpOrderId: null,
+        action: null,
+        invCode: null,
+        fromCorp: null,
+        fromCorpName: null,
+        fromName: null,
+        fromInvCode: null,
+        remark: null,
+        fromType: 2,
+        errMsg: null,
+        checkPreInOrders: null,
+        checkPreInInvCode: null,
+        checkPreInSpaceCode: null,
+        curSpaceCode: null,
+        preSpaceCode: null,
+        preCurSpaceCode: null,  //单据
+        sickerAdNum: null,
+      },
+      orderListDate:[]
+    }
+  },
+  methods: {
+    getValue(info) {
+      getOrderListbyCode(info.adNum)
+        .then((response) => {
+        if (response.code === 20000) {
+          this.orderListDate = response.data.list || []
+          if (this.orderListDate.length > 0){
+            this.idQuery = this.orderListDate[0]
+          }else {
+            this.idQuery.fromCorp = info.adNum
+            this.idQuery.sickerAdNum = info.adNum
+            this.sickerAdNum = info.adNum
+          }
+          this.addOrderVisible = true
+        } else {
+          this.$message.error(response.message)
+        }
+      }).catch((error) => {
+          this.$message.error(error.message)
+          this.list = []
+          this.total = 0
+        })
+      console.log(this.idQuery)
+    },
+    getList() {
+      getSkSickerList(this.filterQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.list = response.data.list || []
+            this.total = response.data.total || 0
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.list = []
+          this.total = 0
+        })
+    },
+    onSubmit() {
+      this.getList()
+    },
+    onReset() {
+      this.filterQuery = {
+        name: '',
+        page: 1,
+        limit: 12
+      }
+      this.getList()
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch
+    }
+  },
+  mounted() {
+
+  },
+  created() {
+    this.getList()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>