科室出库修改

.env.production

@@ -70,7 +70,7 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/'
-# VUE_APP_BASE_API = 'http://192.168.0.125:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

src/components/inout/baziPanel.vue

@@ -25,11 +25,16 @@
           >
           </el-input>
         </el-form-item>
-
+        <el-form-item class="query-form-item" label-width="23%" label="状态:">
+          <el-tag v-if="info.status==1" :type="statusFilterType(info.status)"> {{
+              checkStatus[info.status]
+            }}
+          </el-tag>
+        </el-form-item>
         <el-form-item>
-          <el-button-group>
+          <el-button-group style=" float: right;">
-            <el-button type="primary" @click="onCodeSubmit"
+            <el-button type="primary" @click="onCodeSubmit" style="margin-left: 10px ;"
-                       icon="el-icon-search"
+                       icon="el-icon-thumb"
             >处理单据
             </el-button>
           </el-button-group>
@@ -45,7 +50,12 @@ export default {
   name: '',
   data() {
     return {
-      info:{}
+      info: {},
+      checkStatus: {
+        1: "未完成",
+        0: "已完成",
+        null: "无"
+      },
     }
   },
   props: {
@@ -58,7 +68,15 @@ export default {
   methods: {
     onCodeSubmit() {
       this.$emit('baziPanel', this.info)
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        1: 'warning',
+        2: 'success',
+        null: 'success'
       }
+      return statusMap[status]
+    },
   },
   computed: {}
 }

src/views/inout/DialogCreateOrder.vue

@@ -113,7 +113,7 @@
               <el-select
                 v-model="orderFormData.action"
                 placeholder="请选择单据类型"
-                :disabled="corpOrderIdDisabled"
+                :disabled="corpOrderIdDisabled|| viewTypeKsck"
                 style="width: 90%"
                 filterable
                 @change="actionChange"
@@ -191,7 +191,6 @@
               </el-select>
             </el-form-item>
             <el-form-item
-              prop="fromCorp"
               label="往来信息:"
               v-if="curAction.corpType == 1 && curAction.genUnit "
             >
@@ -201,7 +200,7 @@
                 auto-complete="off"
                 clearable
                 style="width: 90%"
-                :disabled="corpOrderIdDisabled"
+                :disabled="corpOrderIdDisabled || viewTypeKsck"
                 placeholder="请输入病人住院号"
               ></el-input>
 
@@ -218,7 +217,7 @@
                 :loading="loading"
                 @change="sickChange"
                 @keyup.enter.native="remoteFindSickMethod"
-                :disabled="corpOrderIdDisabled"
+                :disabled="corpOrderIdDisabled  || viewTypeKsck"
               >
                 <el-option
                   v-for="item in fromSickOptions"
@@ -679,6 +678,10 @@ export default {
       type: Object,
       required: true,
     },
+    sickerAdName: {
+      type: Object,
+      required: true,
+    },
     viewTypeKsck: {
       type: Boolean,
       required: false,
@@ -1792,6 +1795,7 @@ export default {
   },
   created() {
     //页面初始化
+    debugger
     this.codeFormData.code = "";
     //页面类型
     if (this.viewType == 2) {
@@ -1850,7 +1854,7 @@ export default {
 
     }
     if (this.viewTypeKsck) {
-      this.curAction.corpType = 1,
+      this.curAction.corpType = 1
       this.curAction.genUnit = true
       this.curAction.inputSick = true
     }

src/views/inout/IoDepartmentOrder.vue

@@ -11,7 +11,26 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
         </el-row>
+
+
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -36,19 +55,19 @@
     <el-divider style="margin: 15px"></el-divider>
     <el-card class="el-card">
 
-      <el-row>
+      <el-row :gutter="8">
-        <el-col :span="6" v-for="(bazi,key) in list" :key="key" class="text-center">
+        <el-col :span="6" v-for="(bazi,key) in list" :key="key" :xs="12" :sm="8" :md="6" :lg="6">
           <BaziPanel :info="bazi" @baziPanel="getValue"></BaziPanel>
         </el-col>
       </el-row>
-      <pagination style="height: 20px"
+      <!--      <pagination style="height: 20px"-->
-                  v-show="total>0"
+      <!--                  v-show="total>0"-->
-                  :total="total"
+      <!--                  :total="total"-->
-                  :page-sizes=[12,24,36]
+      <!--                  :page-sizes=[12,24,36]-->
-                  :page.sync="filterQuery.page"
+      <!--                  :page.sync="filterQuery.page"-->
-                  :limit.sync="filterQuery.limit"
+      <!--                  :limit.sync="filterQuery.limit"-->
-                  @pagination="getList"
+      <!--                  @pagination="getList"-->
-      />
+      <!--      />-->
     </el-card>
     <el-dialog
       :title=title
@@ -62,8 +81,9 @@
     >
       <addOrder
         :closeDialog="closeDialog"
-        :orderQuery="this.idQuery"
+        :orderQuery="idQuery"
-        :sickerAdNum="this.sickerAdNum"
+        :sickerAdNum="sickerAdNum"
+        :sickerAdName="sickerAdName"
         :viewType="2"
         :errView="0"
         :viewTypeKsck=true
@@ -193,10 +213,13 @@ export default {
       filterQuery: {
         name: '',
         page: 1,
-        limit: 12
+        limit: 12,
-
+        startTime: null,
+        endTime: null,
       },
+      screenWidth: window.innerWidth,
       sickerAdNum: null,
+      sickerAdName: null,
       addOrderVisible: false,
       enterPatientInfoVisible: false,
       idQuery: {
@@ -231,8 +254,55 @@ export default {
         remark: null,
         deptName: this.$store.getters.locDeptName,
         deptCode: this.$store.getters.locDeptCode
+      },
+      span: 6,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      actDateRange: [],
     }
-    }
+  },
+  computed: {
+    cols() {
+      const colCount = Math.floor(this.screenWidth / 200); // 假设每列最小宽度为100px
+      this.span = 24 / colCount; // 假设总共有24格
+      console.log(this.span)
+      // return Array.from({length: colCount}, (_, index) => ({span}));
+    },
+  },
+  mounted() {
+    window.addEventListener('resize', this.handleResize);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.handleResize);
   },
   methods: {
     getValue(info) {
@@ -249,10 +319,15 @@ export default {
       getOrderListbyCode(query)
         .then((response) => {
           if (response.code === 20000) {
-          this.orderListDate = response.data || []
+            if (this.orderListDate.length > 0) {
-            this.idQuery = this.orderListDate[0]
+              this.idQuery = this.orderListDate[0]; // 确保数组不为空
-            this.sickerAdNum = info.adNum
+            } else {
-          this.addOrderVisible = true
+              // 处理订单列表为空的情况，设置默认值或者显示消息
+            }
+            this.sickerAdNum = info.adNum;
+            this.sickerAdName = info.name;
+            this.addOrderVisible = true;
+            this.list = response.data || [];
           } else {
             this.$message.error(response.message)
           }
@@ -270,6 +345,10 @@ export default {
       this.getList();
     },
     getList() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      }
       getSkSickerList(this.filterQuery)
         .then((response) => {
           if (response.code === 20000) {
@@ -336,10 +415,13 @@ export default {
     },
     hideSearch() {
       this.showSearch = !this.showSearch
-    }
     },
-  mounted() {
+    handleResize() {
-
+      this.screenWidth = window.innerWidth;
+      const colCount = Math.floor(this.screenWidth / 600); // 假设每列最小宽度为100px
+      this.span = 24 / colCount; // 假设总共有24格
+      console.log(this.span)
+    },
   },
   created() {
     this.getList()