需求添加

.env - 副本 (2).development

@@ -1,10 +0,0 @@
-# 若依管理系统/开发环境
-# VUE_APP_BASE_URL = 'http://172.16.6.217:9999/admin'
-# VUE_APP_BASE_URL = 'http://121.36.17.6:9098'
- VUE_APP_BASE_URL = 'http://g34i4b.natappfree.cc/admin'
-
-# 页面标题
-VUE_APP_TITLE = "应急物资系统"
-
-# 开发环境配置
-VUE_APP_ENV = 'development'

.env - 副本.development

@@ -1,10 +0,0 @@
-# 若依管理系统/开发环境
-# VUE_APP_BASE_URL = 'http://192.168.50.205:9999'
-# VUE_APP_BASE_URL = 'http://172.16.6.217:9999'
-VUE_APP_BASE_URL = 'http://121.36.17.6:9099'
-
-# 页面标题
-VUE_APP_TITLE = "应急物资系统"
-
-# 开发环境配置
-VUE_APP_ENV = 'development'

src/api/inAndOut/formationFilling/out.ts

@@ -92,3 +92,25 @@ export function addInOrderData(data: any) {
     data
   });
 }
+
+export function getOutPageNew(data: any) {
+  return request({
+    url: `/admin/order/page`,
+    method: "get",
+    params: data
+  });
+}
+
+export function deleteOutDataNew(id: string) {
+  return request({
+    url: `/admin/order/${id}`,
+    method: "delete"
+  });
+}
+
+export function lookOutDataNew(id: string) {
+  return request({
+    url: `/admin/order/${id}`,
+    method: "get"
+  });
+}

src/views/InformationFilling/outIssue/detail.vue

@@ -1,16 +1,24 @@
 <!-- 应急物资分类表 -->
 <template>
   <basic-container class="container">
-    <el-form class="whole_form" :rules="rules" :inline="true" ref="ruleForms" label-width="80px" :model="formData">
+    <el-form
+      class="whole_form"
+      :rules="rules"
+      :inline="true"
+      ref="ruleForms"
+      label-width="80px"
+      label-suffix=":"
+      :model="formData"
+    >
       <el-row>
         <el-col :span="6">
           <el-form-item label="调令编号">
-            <el-input v-model="formData.orderNo" style="width: 200px" clearable />
+            <el-input v-model="formData.orderNo" :disabled="props.type == 'look'" style="width: 200px" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="调令名称">
-            <el-input v-model="formData.orderName" style="width: 200px" clearable />
+            <el-input v-model="formData.orderName" :disabled="props.type == 'look'" style="width: 200px" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -20,6 +28,7 @@
               v-model:file-list="formData.filePartList"
               class="upload-demo"
               style="width: 100%"
+              v-if="props.type != 'look'"
               :action="fileUrl"
               :data="paramsData"
               :headers="myHeader"
@@ -33,13 +42,14 @@
               :limit="1"
               :on-exceed="handleExceed"
             >
-              <el-button v-if="props.type != 'look'" size="small" type="primary">选择文件</el-button>
+              <el-button size="small" type="primary">选择文件</el-button>
             </el-upload>
+            <span v-else>{{ formData.fileName }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="备注">
-            <el-input v-model="formData.remarks" style="width: 100%" clearable />
+            <el-input v-model="formData.remarks" :disabled="props.type == 'look'" style="width: 100%" clearable />
           </el-form-item>
         </el-col>
       </el-row>
@@ -273,7 +283,7 @@ import router from "@/router";
 import {
   addInOrderData,
   updateOutData,
-  lookOutData,
+  lookOutDataNew,
   dictTree,
   getDeptTypeList
 } from "@/api/inAndOut/formationFilling/out";
@@ -372,12 +382,6 @@ const rules = reactive({
   ]
 });
 
-// 根据码回显中文
-const showCh = (value, option) => {
-  const filterItem = option.filter((item) => item.deptId == value);
-  return filterItem.length ? filterItem[0].abbreviationName : "";
-};
-
 // 下拉数据
 const getSelect = () => {
   dictTree().then((res: any) => {
@@ -427,14 +431,21 @@ const deleteTableData = (rowIndex) => {
 };
 // 详情获取数据
 const lookData = () => {
-  lookOutData(props.id).then((res: any) => {
+  lookOutDataNew(props.id).then((res: any) => {
     if (res.code === 0) {
-      let getData = res.data.outboundMaterial;
+      let getData = res.data.orderOutboundMaterialInfos;
       formData.tableData = getData.map((item: any) => ({
         ...item,
         filePartList: [{ name: item.fileName, filePart: item.filePart }]
       }));
-      formData.deptId = res.data.deptId;
+      formData.orderNo = res.data.orderNo;
+      formData.filePartList = res.data.filePartList;
+      formData.orderName = res.data.orderName;
+      formData.filePart = res.data.filePart;
+      formData.fileName = res.data.fileName;
+      formData.filePart = res.data.filePart;
+      formData.remarks = res.data.remarks;
+      formData.filePartList = [{ name: res.data.fileName, url: res.data.filePart }];
       console.log(formData.tableData);
     }
   });
@@ -443,37 +454,32 @@ const lookData = () => {
 const saveSubmit = (status: any) => {
   ruleForms.value.validate((valid: any) => {
     if (valid) {
-      let postData = { ...formData, status, orderOutboundMaterialInfos: [] };
+      let postData = { ...formData, status, orderOutboundMaterialInfos: [], orderId: null };
       formData.tableData.map((item: any) => {
         let totalPrice = decimalMul(item.quantity, item.unitPrice) || 0;
         if (wanJson.indexOf(item.materialTree[3]) == -1) {
           totalPrice = decimalDev(decimalMul(item.quantity, item.unitPrice), 10000) || 0;
         }
         item.totalPrice = totalPrice;
+        item.materialGroup = item.materialTree[0];
+        item.materialType = item.materialTree[1];
+        item.materialName = item.materialTree[2];
+        item.unit = item.materialTree[3];
       });
       postData.orderOutboundMaterialInfos = formData.tableData;
       delete postData.tableData;
       if (props.id) {
-        updateOutData(postData).then((res: any) => {
-          if (res.code === 0) {
-            returnPage();
-            ElMessage({
-              message: "修改成功！",
-              type: "success"
-            });
-          }
-        });
-      } else {
-        addInOrderData(postData).then((res: any) => {
-          if (res.code === 0) {
-            returnPage();
-            ElMessage({
-              message: "新增成功！",
-              type: "success"
-            });
-          }
-        });
+        postData.orderId = props.id;
       }
+      addInOrderData(postData).then((res: any) => {
+        if (res.code === 0) {
+          returnPage();
+          ElMessage({
+            message: status === "8" ? "保存成功！" : "提交成功！",
+            type: "success"
+          });
+        }
+      });
     } else {
       console.log("error submit!");
     }

src/views/InformationFilling/outIssue/index.vue

@@ -18,13 +18,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="物资名称">
-        <el-input v-model="searchList.materialNameVo" style="width: 200px" clearable />
+        <el-input v-model="searchList.materialName" style="width: 200px" clearable />
       </el-form-item>
       <el-form-item label="调令名称">
-        <el-input v-model="searchList.materialNameVo" style="width: 200px" clearable />
+        <el-input v-model="searchList.orderName" style="width: 200px" clearable />
       </el-form-item>
       <el-form-item label="调用省份">
-        <el-select v-model="searchList.provinceSiteIdList" multiple filterable style="width: 250px" clearable>
+        <el-select v-model="searchList.province" multiple filterable style="width: 250px" clearable>
           <el-option v-for="item in province_ch" :key="item.id" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -44,9 +44,9 @@
         >
           <el-button :icon="Upload" type="primary">导入</el-button>
         </el-upload> -->
-        <el-button type="primary" :icon="Download" @click="exportTemplate" v-if="hasBtn('ck:xf:export')"
+        <!-- <el-button type="primary" :icon="Download" @click="exportTemplate" v-if="hasBtn('ck:xf:export')"
           >导出</el-button
-        >
+        > -->
       </el-form-item>
     </el-form>
     <el-table :data="tableData" style="width: 100%" stripe border>
@@ -55,24 +55,16 @@
           {{ (page.currentPage - 1) * page.pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column prop="warehouse" label="调令名称" align="center" />
+      <el-table-column prop="orderName" label="调令名称" align="center" />
       <el-table-column prop="warehouse" label="调出仓库" align="center" />
       <el-table-column prop="outboundType" label="出库类型" align="center">
         <template #default="scope">
           {{ scope.row.outboundType ? showCh(scope.row.outboundType, outdound_type) : scope.row.outboundType }}
         </template>
       </el-table-column>
-      <!-- <el-table-column prop="materialGroup" label="物资大类" align="center" /> -->
-      <!-- <el-table-column prop="materialType" label="物资类别" align="center" /> -->
       <el-table-column prop="materialName" label="物资名称" align="center" />
       <el-table-column prop="quantity" label="数量" align="center" width="80" />
-      <el-table-column prop="totalPrice" label="价值(万元)" align="center" width="110" />
-      <el-table-column prop="calledProvince" label="调用省份" align="center">
-        <template #default="scope">
-          {{ scope.row.calledProvince ? showCh(scope.row.calledProvince, province_ch) : scope.row.calledProvince }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="outboundTime" label="出库日期" align="center" width="115" />
+      <el-table-column prop="province" label="调用省份" align="center"></el-table-column>
       <el-table-column prop="submitTime" label="填写时间" align="center" width="115" />
       <el-table-column fixed="right" label="操作" width="150" align="center">
         <template #default="{ row }">
@@ -97,9 +89,9 @@
 <script setup lang="ts">
 import { Plus, Search, RefreshRight, Upload, Download } from "@element-plus/icons-vue";
 import { ref, reactive, onMounted } from "vue";
-import { getOutPage, deleteOutData, getDeptTypeList, exportcjxxxf } from "@/api/inAndOut/formationFilling/out";
+import { deleteOutDataNew, getDeptTypeList, exportcjxxxf, getOutPageNew } from "@/api/inAndOut/formationFilling/out";
 import router from "@/router";
-import { ElMessage, UploadProps } from "element-plus";
+import { ElMessage, UploadProps, ElMessageBox } from "element-plus";
 import { useDict } from "@/hooks/dict";
 import store from "@/store";
 import { errorUpload, beforeUploadFun, fileNameDispose } from "@/global/importFile";
@@ -113,9 +105,11 @@ const { outdound_type, province_ch } = useDict("outdound_type", "province_ch");
 const dcckOptions = ref([]);
 const searchList = ref({
   outboundType: "",
-  materialNameVo: "",
+  materialName: "",
   deptId: "", //调出仓库id
-  provinceSiteIdList: []
+  provinceSiteIdList: [],
+  orderName: "",
+  province: ""
 });
 const tableData: any = ref([]);
 const page = reactive({
@@ -136,15 +130,17 @@ const showCh = (value, option) => {
 const clearSearch = () => {
   searchList.value = {
     outboundType: "",
-    materialNameVo: "",
+    materialName: "",
     deptId: "", //调出仓库id
-    provinceSiteIdList: []
+    provinceSiteIdList: [],
+    orderName: "",
+    province: ""
   };
   getList();
 };
 /** 添加/修改/查看进入详情操作 */
-const openDetail = (row: any, type) => {
-  setQuery("/InformationFilling/outIssueDetail", { id: row.outboundId, type: type });
+const openDetail = (row: any, type: string) => {
+  setQuery("/InformationFilling/outIssueDetail", { id: row.orderId, type: type });
   // router.push({
   //   path: "/InformationFilling/outIssueDetail",
   //   query: {id: row.outboundId, type: type}
@@ -156,18 +152,17 @@ const getList = () => {
   store.commit("SET_SEARCH_QUERY", {
     outIssue: {
       outboundType: searchList.value.outboundType,
-      materialNameVo: searchList.value.materialNameVo,
+      materialName: searchList.value.materialName,
       deptId: searchList.value.deptId
     }
   });
   const data = reactive({
     // status: 7,
-    lower: 1,
     size: page.pageSize,
     current: page.currentPage,
     ...searchList.value
   });
-  getOutPage(data).then((res: any) => {
+  getOutPageNew(data).then((res: any) => {
     if (res.code === 0) {
       tableData.value = res.data.records;
       page.total = res.data.total;
@@ -175,15 +170,26 @@ const getList = () => {
   });
 };
 /** 删除操作 */
-const deleteClick = (row) => {
-  deleteOutData(row.outboundId).then((res: any) => {
-    if (res.code === 0) {
-      getList();
-      ElMessage({
-        message: "删除成功！",
-        type: "success"
-      });
-    }
+const deleteClick = (row: any) => {
+  ElMessageBox.confirm(`是否删除此条数据？`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    deleteOutDataNew(row.orderId).then((res: any) => {
+      if (res.code === 0) {
+        getList();
+        ElMessage({
+          message: "删除成功！",
+          type: "success"
+        });
+      } else {
+        ElMessage({
+          message: "删除失败！",
+          type: "error"
+        });
+      }
+    });
   });
 };
 //导入模板