提交

src/views/wisdom/bill/index.vue

@@ -40,7 +40,7 @@
           <el-col :span="14">
             <el-button type="primary" plain @click="handleAdd(false)" v-hasPermi="['wisdom:bill:add']">新增入库</el-button>
             <el-button type="warning" plain @click="handleExport" v-hasPermi="['wisdom:bill:export']">导出</el-button>
-            <el-button type="primary" plain @click="rkUpload">图片上传</el-button>
+            <!-- <el-button type="primary" plain @click="rkUpload">图片上传</el-button> -->
           </el-col>
 
           <el-col :span="9" class="searchBtn">
@@ -51,8 +51,8 @@
           </el-col>
         </el-row>
         <el-table v-loading="loading" ref="billTableRef" :data="billList" highlight-current-row @row-click="(row) => tableInfoRowClick(row, billTableRef)" :row-class-name="tableBillRowClassName" @row-dblclick="billClick"
-          @current-change="uploadSelectionChange">
+          @selection-change="billSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
+          <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="单据号" align="center" prop="billNo" width="180" />
           <el-table-column label="库存状态" align="center">
             <template #default="scope">
@@ -1090,7 +1090,7 @@ const bizTypeList = ref([
   { value: 0, label: "已入库", elTagType: "success", elTagClass: null },
   { value: 1, label: "已出库", elTagType: "warning", elTagClass: null },
   { value: 2, label: "借料出库", elTagType: "danger", elTagClass: null },
-  { value: 3, label: "还料入库", elTagType: "primary", elTagClass: null },
+  { value: 3, label: "已归还", elTagType: "primary", elTagClass: null },
 ]);
 const dictTagData = () => {
   return bizTypeList.value.map((item) => ({
@@ -1149,6 +1149,14 @@ function billClick(row, type, status) {
   detailList(type);
 }
 
+const billSelectionChange = (selection) => {
+  console.log(selection);
+  if (selection.length > 1) {
+    proxy.$modal.msgError("只能选择一条数据");
+    return;
+  }
+}
+
 const checkStockList = ref([]); //移库、调度 多选框选中数据
 //移库  多选框选中数据  生成调度任务多选
 function printSelectionChange(selection) {
@@ -1605,23 +1613,6 @@ function tableRowClassName({ row, rowIndex }) {
   return "";
 }
 
-//上传、修改 单选 选中数据
-function uploadSelectionChange(selection) {
-  if (selection) {
-    uploadParams.value.photoType = selection.isChuku;
-    uploadParams.value.billNo = selection.billNo;
-    uploadParams.value.typeName = selection.rkTypeName;
-
-    if (selection.isChuku == "3" || selection.isChuku == "1") {
-      uploadParams.value.photoType = 1;
-      uploadParams.value.billNo = selection.billNoCk;
-      uploadParams.value.typeName = selection.ckTypeName;
-    }
-
-    uploadParams.value.gysMc = selection.gysMc;
-    uploadParams.value.xmMs = selection.xmMs;
-  }
-}
 
 //入库上传图片按钮
 function rkUpload() {
@@ -1663,11 +1654,11 @@ const submitDelStock = () => {
 };
 /** 导出按钮操作 */
 function handleExport() {
+  let obj = JSON.parse(JSON.stringify(queryParams.value));
+  obj.bizTypeList = [0, 3];
   proxy.download(
-    "wisdom/stock/export",
+    "/wisdom/record/export",
-    {
+    obj,
-      ...queryParams.value,
-    },
     `stock_${new Date().getTime()}.xlsx`
   );
 }

src/views/wisdom/outbound/index.vue

@@ -1084,7 +1084,7 @@ const bizTypeList = ref([
   { value: 0, label: "已入库", elTagType: "success", elTagClass: null },
   { value: 1, label: "已出库", elTagType: "warning", elTagClass: null },
   { value: 2, label: "借料出库", elTagType: "danger", elTagClass: null },
-  { value: 3, label: "还料入库", elTagType: "primary", elTagClass: null },
+  { value: 3, label: "已归还", elTagType: "primary", elTagClass: null },
 ]);
 const dictTagData = () => {
   return bizTypeList.value.map((item) => ({
@@ -1249,11 +1249,11 @@ function submitForm() {
 
 /** 导出按钮操作 */
 function handleExport() {
+  let obj = JSON.parse(JSON.stringify(queryParams.value));
+  obj.bizTypeList = [1, 2];
   proxy.download(
     "wisdom/stock/export",
-    {
+    obj,
-      ...queryParams.value,
-    },
     `stock_${new Date().getTime()}.xlsx`
   );
 }

src/views/wisdom/record/index.vue

@@ -172,7 +172,7 @@ const isChukuList = ref([
   { value: 0, label: "已入库", elTagType: "success", elTagClass: null },
   { value: 1, label: "已出库", elTagType: "warning", elTagClass: null },
   { value: 2, label: "借料出库", elTagType: "danger", elTagClass: null },
-  { value: 3, label: "还料入库", elTagType: "primary", elTagClass: null },
+  { value: 3, label: "已归还", elTagType: "primary", elTagClass: null },
 ])
 
 const data = reactive({