Revert "```"

This reverts commit abc0674531.

openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagentList/index.vue

@@ -7,18 +7,23 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <!-- supplyBusNo searchKey-->
+    <!-- supplyBusNo searchKey-->
       <el-form-item label="单据号：" prop="searchKey">
         <el-input
           v-model="queryParams.searchKey"
           placeholder="单据号："
           clearable
-          style="width: 220px"
+          style="width: 220px;"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="单据类型：" prop="typeEnum">
-        <el-select v-model="queryParams.typeEnum" placeholder="" clearable style="width: 150px">
+        <el-select
+          v-model="queryParams.typeEnum"
+          placeholder=""
+          clearable
+          style="width: 150px"
+        >
           <el-option
             v-for="supplyStatus in supplyTypeOptions"
             :key="supplyStatus.value"
@@ -66,10 +71,15 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="审批状态：" prop="statusEnum">
-        <el-select v-model="queryParams.statusEnum" placeholder="" clearable style="width: 150px">
+       <el-form-item label="审批状态：" prop="statusEnum">
+        <el-select
+          v-model="queryParams.statusEnum"
+          placeholder=""
+          clearable
+          style="width: 150px"
+        >
           <el-option
-            v-for="supplyStatus in supplyStatusOptions"
+            v-for="supplyStatus in supplyStatusOptions" 
             :key="supplyStatus.value"
             :label="supplyStatus.label"
             :value="supplyStatus.value"
@@ -91,28 +101,49 @@
     <el-row :gutter="10" class="mb8">
       <!-- 添加记录 -->
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="openAddaddTransferProductDialog"
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="openAddaddTransferProductDialog"
+          
           >新增调拨单</el-button
         >
         <!-- v-hasPermi="['system:user:add']" -->
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="openAddaddTransferProducts"
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="openAddaddTransferProducts"
+          
           >新增批量调拨单</el-button
         >
         <!-- v-hasPermi="['system:user:add']" -->
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="Search"
+          @click="handleQuery"
+          
+          >查询</el-button
+        >
         <!-- v-hasPermi="['system:user:import']" -->
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="CircleClose" @click="handleClear">重置</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="CircleClose"
+          @click="handleClear"
+          
+          >重置</el-button
+        >
         <!-- v-hasPermi="['system:user:export']" -->
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Download" @click="handleExport">导出</el-button>
-      </el-col>
     </el-row>
 
     <el-table
@@ -121,7 +152,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="50" align="center" />
-      <!-- <el-table-column
+     <!-- <el-table-column
         label="药品名称"
         align="center"
         key="name"
@@ -134,7 +165,7 @@
         align="center"
         key="supplyBusNo"
         prop="supplyBusNo"
-        width="200"
+         width="200"
         :show-overflow-tooltip="true"
       />
       <!-- itemTable -->
@@ -221,11 +252,7 @@
             link
             type="primary"
             icon="View"
-            @click="
-              () => {
-                proxy.$refs['detailsDialogRef'].open(scope.row.supplyBusNo);
-              }
-            "
+            @click="handleUpdate(scope.row,'view')"
             >详情</el-button
           >
           <el-button
@@ -233,10 +260,9 @@
             type="primary"
             icon="Edit"
             @click="handleUpdate(scope.row)"
+            
             :disabled="
-              scope.row.statusEnum != '1' &&
-              scope.row.statusEnum != '9' &&
-              scope.row.statusEnum != '4'
+              scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'
             "
             >编辑</el-button
           >
@@ -246,6 +272,7 @@
             type="primary"
             icon="View"
             @click="handleSubmitApproval(scope.row)"
+            
             v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'"
             >提交审批</el-button
           >
@@ -255,6 +282,7 @@
             type="primary"
             icon="View"
             @click="handleWithdrawApproval(scope.row)"
+            
             v-if="scope.row.statusEnum == '2'"
             >撤销审批</el-button
           >
@@ -269,7 +297,6 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-    <TransferDetailsDialog ref="detailsDialogRef" />
     <!-- <Dialog
       ref="transferProductRef"
       :supplyTypeOptions="supplyTypeOptions"
@@ -290,10 +317,9 @@ import {
   submitApproval,
   withdrawApproval,
   delTransferProduct,
-  getpharmacyCabinetList,
-} from '../components/transferManagement';
+  getpharmacyCabinetList
+} from "../components/transferManagement";
 import { useStore } from '@/store/store';
-import TransferDetailsDialog from '../components/transferDetailsDialog.vue';
 const store = useStore();
 // import Dialog from "./components/Dialog";
 
@@ -301,7 +327,7 @@ const router = useRouter();
 const { proxy } = getCurrentInstance();
 
 const purchaseinventoryRef = ref(null); // 初始化 ref
-const getpharmacyCabinetOptions = ref([]);
+const getpharmacyCabinetOptions = ref([])
 const purchaseinventoryList = ref([]);
 const open = ref(false);
 const loading = ref(true);
@@ -310,12 +336,12 @@ const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref('');
+const title = ref("");
 const occurrenceTime = ref([]);
-const busNoAdd = ref(''); // 单据号新增
+const busNoAdd = ref(""); // 单据号新增
 const purposeTypeListOptions = ref(undefined);
-const sourceTypeListOptions = ref(undefined);
-const supplyTypeOptions = ref(undefined);
+const sourceTypeListOptions = ref(undefined)
+const supplyTypeOptions = ref(undefined); 
 const sourceLocationIdListOptions = ref(undefined); // 源仓库
 const purposeLocationIdListOptions = ref(undefined); //目的仓库
 const supplyStatusOptions = ref(undefined);
@@ -328,13 +354,13 @@ const data = reactive({
   queryParams: {
     pageNo: 1,
     pageSize: 10,
-    searchKey: undefined,
-    typeEnum: undefined, // 单据类型
-    sourceLocationId: undefined, //源仓库
-    purposeLocationId: undefined, // 目的仓库
+    searchKey: undefined, 
+    typeEnum:undefined, // 单据类型
+    sourceLocationId:undefined,//源仓库
+    purposeLocationId:undefined,// 目的仓库
     statusEnum: undefined, // 单据状态
-    createTimeSTime: undefined,
-    createTimeETime: undefined,
+    createTimeSTime:undefined,
+    createTimeETime:undefined,
   },
   rules: {},
 });
@@ -344,14 +370,14 @@ const { queryParams, form, rules } = toRefs(data);
 /** 调拨管理查询下拉树结构 */
 function getTransferProductTypeList() {
   getInit().then((response) => {
-    purposeTypeListOptions.value = response.data.purposeTypeListOptions;
+    purposeTypeListOptions.value = response.data.purposeTypeListOptions; 
     sourceTypeListOptions.value = response.data.sourceTypeListOptions;
-    supplyTypeOptions.value = response.data.supplyTypeOptions;
-    supplyStatusOptions.value = response.data.supplyStatusOptions;
+    supplyTypeOptions.value = response.data.supplyTypeOptions ;
+    supplyStatusOptions.value = response.data.supplyStatusOptions; 
   });
   getpharmacyCabinetList().then((response) => {
-    getpharmacyCabinetOptions.value = response.data;
-  });
+    getpharmacyCabinetOptions.value = response.data
+  })
 }
 
 /** 查询调拨管理项目列表 */
@@ -368,12 +394,12 @@ function getList() {
 function handleQuery() {
   queryParams.value.createTimeSTime =
     occurrenceTime.value && occurrenceTime.value.length == 2
-      ? occurrenceTime.value[0] + ' 00:00:00'
-      : '';
+      ? occurrenceTime.value[0] + " 00:00:00"
+      : "";
   queryParams.value.createTimeETime =
     occurrenceTime.value && occurrenceTime.value.length == 2
-      ? occurrenceTime.value[1] + ' 23:59:59'
-      : '';
+      ? occurrenceTime.value[1] + " 23:59:59"
+      : "";
   queryParams.value.pageNo = 1;
   getList();
 }
@@ -381,10 +407,10 @@ function handleQuery() {
 /** 清空条件按钮操作 */
 function handleClear() {
   // 清空查询条件
-  queryParams.value.createTimeSTime = '';
-  queryParams.value.createTimeETime = '';
-  occurrenceTime.value = '';
-  proxy.resetForm('queryRef');
+  queryParams.value.createTimeSTime = ""
+  queryParams.value.createTimeETime = ""
+  occurrenceTime.value = ""
+  proxy.resetForm("queryRef");
   getList();
 }
 
@@ -395,8 +421,8 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 /** 打开批量新增 */
-function openAddaddTransferProducts() {
-  router.push({ path: '/medicationmanagement/transferManagement/batchTransfer' });
+function openAddaddTransferProducts(){
+  router.push({ path: '/medicationmanagement/transferManagement/batchTransfer'})
 }
 /** 打开新增 */
 function openAddaddTransferProductDialog() {
@@ -408,31 +434,32 @@ function openAddaddTransferProductDialog() {
   // const partItem = {partFlg: 'add',rowData: []}
   // item: JSON.stringify(partItem)
   // ,query:{item: JSON.stringify(partItem)}
-  sessionStorage.setItem('busNo', '');
-  store.clearCurrentDataDB();
-  router.push({ path: '/medicationmanagement/transferManagement/transferManagent' });
+  sessionStorage.setItem('busNo',"")
+  store.clearCurrentDataDB()
+  router.push({ path: '/medicationmanagement/transferManagement/transferManagent'})
 }
 
 /** 修改按钮操作 */
-function handleUpdate(row, view) {
+function handleUpdate(row,view) {
   editRow.value = row;
-  if (row.typeEnum == 8) {
-    // 批量调拨
-    router.replace({
-      path: '/medicationmanagement/transferManagement/batchTransfer',
-      query: { supplyBusNo: editRow.value.supplyBusNo, isEdit: true },
-    });
-  } else {
-    router.replace({
-      path: '/medicationmanagement/transferManagement/transferManagent',
-      query: { supplyBusNo: editRow.value.supplyBusNo, isEdit: true },
-    });
+  if(row.typeEnum==8){  // 批量调拨
+    if(view){
+      router.replace({ path: '/medicationmanagement/transferManagement/batchTransfer',query:{supplyBusNo:row.supplyBusNo,view:view}})
+    }else{
+      router.push({ path: '/medicationmanagement/transferManagement/batchTransfer',query:{supplyBusNo:editRow.value.supplyBusNo}})
+    }
+  }else{
+    if(view){
+      router.replace({path: '/medicationmanagement/transferManagement/transferManagent',query:{supplyBusNo:row.supplyBusNo,view:view}});
+    }else{
+      router.push({ path: '/medicationmanagement/transferManagement/transferManagent',query:{supplyBusNo:editRow.value.supplyBusNo}})
+    }
   }
 }
 /** 提交审核按钮 */
 function handleSubmitApproval(row) {
   submitApproval(row.supplyBusNo).then((response) => {
-    proxy.$modal.msgSuccess('提交审批成功');
+    proxy.$modal.msgSuccess("提交审批成功");
     open.value = false;
     getList();
   });
@@ -441,7 +468,7 @@ function handleSubmitApproval(row) {
 /** 撤回审批按钮 */
 function handleWithdrawApproval(row) {
   withdrawApproval(row.supplyBusNo).then((response) => {
-    proxy.$modal.msgSuccess('撤销审批成功');
+    proxy.$modal.msgSuccess("撤销审批成功");
     open.value = false;
     getList();
   });
@@ -451,25 +478,16 @@ function handleWithdrawApproval(row) {
 function handleDelete(row) {
   const delId = row.id || ids.value;
   proxy.$modal
-    .confirm('是否确认删除以上数据?')
+    .confirm("是否确认删除以上数据?")
     .then(function () {
-      return delTransferProduct({ ids: delId.join(',') });
+      return delTransferProduct({ ids: delId.join(",") });
     })
     .then(() => {
       getList();
-      proxy.$modal.msgSuccess('删除成功');
+      proxy.$modal.msgSuccess("删除成功");
     })
     .catch(() => {});
 }
-function handleExport() {
-  proxy.downloadGet(
-    'inventory-manage/transfer/export-excel',
-    {
-      ...queryParams.value,
-    },
-    `调拨单_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
-  );
-}
 
 getTransferProductTypeList();
 getList();