提交merge1.3

openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/index.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="app-container">
-<<<<<<< HEAD
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-=======
     <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules">
->>>>>>> v1.3
       <el-form-item label="项目名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -14,11 +10,7 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-<<<<<<< HEAD
-      <el-form-item label="仓库类型" prop="purposeTypeEnum">
-=======
       <el-form-item label="仓库" prop="purposeTypeEnum">
->>>>>>> v1.3
         <el-select
           v-model="queryParams.purposeTypeEnum"
           placeholder="请选择"
@@ -26,10 +18,7 @@
           filterable
           style="width: 200px"
           @change="handleChangePurposeTypeEnum"
-<<<<<<< HEAD
-=======
           @keyup.enter="handleQuery"
->>>>>>> v1.3
         >
           <el-option
             v-for="item in warehous_type"
@@ -39,34 +28,18 @@
           />
         </el-select>
       </el-form-item>
-<<<<<<< HEAD
-      <el-form-item label="盘点仓库" prop="purposeLocationId">
-        <el-select
-          v-model="queryParams.purposeLocationId"
-=======
       <el-form-item label="盘点仓库" prop="sourceLocationId">
         <el-select
           v-model="queryParams.sourceLocationId"
->>>>>>> v1.3
           placeholder="请选择"
           clearable
           filterable
           style="width: 200px"
-<<<<<<< HEAD
-          @change="handleCabinetChange(receiptHeaderForm.purposeLocationId)"
-        >
-          <el-option
-            v-for="item in [
-              { id: 1, name: '仓库1' },
-              { id: 2, name: '仓库2' },
-            ]"
-=======
           :disabled="!queryParams.purposeTypeEnum"
           @keyup.enter="handleQuery"
         >
           <el-option
             v-for="item in purposeTypeListOptions"
->>>>>>> v1.3
             :key="item.id"
             :label="item.name"
             :value="item.id"
@@ -81,19 +54,6 @@
           filterable
           style="width: 200px"
         >
-<<<<<<< HEAD
-          <el-option
-            v-for="item in [
-              { id: 1, name: '货位1' },
-              { id: 2, name: '货位2' },
-            ]"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-=======
           <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -108,14 +68,11 @@
           format="YYYY-MM-DD"
         ></el-date-picker>
       </el-form-item>
->>>>>>> v1.3
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-<<<<<<< HEAD
-=======
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -129,17 +86,13 @@
         >
       </el-col>
     </el-row>
->>>>>>> v1.3
     <el-table
       v-loading="loading"
       :data="dataList"
       @selection-change="handleSelectionChange"
       height="calc(100vh - 250px)"
     >
-<<<<<<< HEAD
-=======
       <el-table-column type="selection" width="55" align="center" fixed></el-table-column>
->>>>>>> v1.3
       <el-table-column
         label="项目"
         align="center"
@@ -149,16 +102,6 @@
         fixed
       ></el-table-column>
       <el-table-column label="规格" align="center" prop="totalVolume" />
-<<<<<<< HEAD
-      <el-table-column label="厂家/产地" align="center" prop="manufacturer" show-overflow-tooltip />
-      <el-table-column label="产品批号" align="center" prop="lotNumber" />
-      <el-table-column label="单价" align="center" key="unit" prop="unitPrice" />
-      <el-table-column label="发放数量" align="center" prop="dispenseQuantity" />
-      <el-table-column label="库存数量" align="center" prop="quantity" />
-      <el-table-column label="盈亏数量" align="center" prop="itemQuantity">
-        <template #default="scope">
-          <el-input v-model="scope.row.itemQuantity" :input-style="{ textAlign: 'center' }" type="number" />
-=======
       <el-table-column label="厂家/产地" align="center" prop="manufacturerText" show-overflow-tooltip />
       <el-table-column label="产品批号" align="center" prop="lotNumber" />
       <el-table-column label="单价(元)" align="center" key="unit" prop="unitPrice" />
@@ -188,7 +131,6 @@
       <el-table-column label="盈亏数量" align="center" prop="profitLoss">
         <template #default="scope">
           {{ calcProfitLoss(scope.row) }}
->>>>>>> v1.3
         </template>
       </el-table-column>
       <el-table-column label="单位" align="center" prop="unitCode_dictText" />
@@ -197,14 +139,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button
-<<<<<<< HEAD
-            size="mini"
-            type="text"
-=======
             size="small"
             type="primary"
             link
->>>>>>> v1.3
             icon="Check"
             @click="handleSave(scope.row)"
             v-hasPermi="['chkstock:partDeptDevice:edit']"
@@ -216,27 +153,6 @@
   </div>
 </template>
 <script setup>
-<<<<<<< HEAD
-import { ref, reactive, toRaw, computed, watch, onMounted } from 'vue';
-const { proxy } = getCurrentInstance();
-import { getStockTakeList } from './components/api.js';
-const { warehous_type } = proxy.useDict('warehous_type');
-const dataList = ref([]);
-const queryParams = reactive({
-  // pageNo: 1,
-  // pageSize: 10,
-});
-const loading = ref(false);
-const showSearch = ref(true);
-const total = ref(0);
-// 获取列表
-const getList = () => {
-  loading.value = true;
-  getStockTakeList(queryParams.value).then((res) => {
-    loading.value = false;
-    dataList.value = res.data;
-    total.value = res.data.length;
-=======
 import { ref, reactive, getCurrentInstance, onMounted } from 'vue';
 import {
   getStockTakeList,
@@ -271,33 +187,12 @@ const getList = () => {
   getStockTakeList(params).then((res) => {
     loading.value = false;
     dataList.value = res.data;
->>>>>>> v1.3
   });
 };
 // 搜索
 const handleQuery = () => {
   getList();
 };
-<<<<<<< HEAD
-// 重置
-const resetQuery = () => {
-  queryParams.value = {};
-  handleQuery();
-};
-// 重置
-const reset = () => {};
-
-// 多选
-const handleSelectionChange = (selection) => {};
-// 保存
-const handleSave = (row) => {
-  console.log(row);
-  // 校验盈亏数量
-  if (row.itemQuantity == '' || row.itemQuantity == null) {
-    proxy.$modal.msgWarning('盈亏数量不能为空');
-    return;
-  }
-=======
 
 // 重置
 const resetQuery = () => {
@@ -367,7 +262,6 @@ const handleSave = (row) => {
   }
 
   const payload = buildSummaryPayload(targetRows);
->>>>>>> v1.3
   proxy.$modal
     .confirm('确定保存吗？', '保存', {
       confirmButtonText: '保存',
@@ -375,15 +269,6 @@ const handleSave = (row) => {
       type: 'warning',
     })
     .then(() => {
-<<<<<<< HEAD
-      proxy.$modal.msgSuccess('保存成功');
-      getList();
-    })
-    .catch(() => {});
-};
-const handleChangePurposeTypeEnum = (val) => {};
-const handleCabinetChange = (val) => {};
-=======
       saveOrgDeviceSummary(payload).then(() => {
         proxy.$modal.msgSuccess('保存成功');
         getList();
@@ -407,7 +292,6 @@ const handleChangePurposeTypeEnum = (val) => {
   getList();
 };
 
->>>>>>> v1.3
 onMounted(() => {
   getList();
 });