lxf il y a 2 ans
Parent
commit
d815aa8531

+ 4 - 8
src/views/purchaseSales/outAndInWarehouse/manualDelivery/index.vue

@@ -15,13 +15,6 @@
           },
         ]"
         @get-list="getList">
-        <template #amount="{ item }">
-          <div :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')">
-            <span style="padding-right: 4px">{{ item.currency }}</span>
-            <span v-if="item.status === '20'">-</span>
-            <span>{{ moneyFormat(item.amount, 2) }}</span>
-          </div>
-        </template>
       </byTable>
     </div>
 
@@ -109,7 +102,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品编码",
-        prop: "code",
+        prop: "productCode",
         width: 160,
       },
     },
@@ -267,6 +260,9 @@ const submitForm = () => {
     );
   });
 };
+const handleDelete = (index) => {
+  formData.data.list.splice(index, 1);
+};
 </script>
 
 <style lang="scss" scoped>

+ 4 - 8
src/views/purchaseSales/outAndInWarehouse/manualWarehousing/index.vue

@@ -15,13 +15,6 @@
           },
         ]"
         @get-list="getList">
-        <template #amount="{ item }">
-          <div :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')">
-            <span style="padding-right: 4px">{{ item.currency }}</span>
-            <span v-if="item.status === '20'">-</span>
-            <span>{{ moneyFormat(item.amount, 2) }}</span>
-          </div>
-        </template>
       </byTable>
     </div>
 
@@ -109,7 +102,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品编码",
-        prop: "code",
+        prop: "productCode",
         width: 160,
       },
     },
@@ -267,6 +260,9 @@ const submitForm = () => {
     );
   });
 };
+const handleDelete = (index) => {
+  formData.data.list.splice(index, 1);
+};
 </script>
 
 <style lang="scss" scoped>

+ 312 - 0
src/views/purchaseSales/outAndInWarehouse/warehouseAdjustment/index.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="tenant">
+    <div class="content">
+      <byTable
+        :source="sourceList.data"
+        :pagination="sourceList.pagination"
+        :config="config"
+        :loading="loading"
+        :selectConfig="selectConfig"
+        highlight-current-row
+        :action-list="[
+          {
+            text: '新增调仓',
+            action: () => openModal(),
+          },
+        ]"
+        @get-list="getList">
+      </byTable>
+    </div>
+
+    <el-dialog title="新增调仓" v-if="dialogVisible" v-model="dialogVisible" width="1000" v-loading="loadingDialog">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
+        <template #details>
+          <div style="width: 100%">
+            <el-button type="primary" @click="openProduct = true">添加明细</el-button>
+            <el-table :data="formData.data.list" style="width: 100%; margin-top: 16px">
+              <el-table-column prop="code" label="产品编码" width="140" />
+              <el-table-column prop="productName" label="产品名称" min-width="220" />
+              <el-table-column prop="productModel" label="规格型号" min-width="220" />
+              <el-table-column prop="unit" label="单位" width="100" />
+              <el-table-column label="入库数量" width="160">
+                <template #default="{ row, $index }">
+                  <div style="width: 100%">
+                    <el-form-item :prop="'list.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true">
+                      <el-input-number v-model="row.quantity" placeholder="请输入数量" style="width: 100%" :precision="0" :controls="false" :min="0" />
+                    </el-form-item>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="操作" width="80" fixed="right">
+                <template #default="{ row, $index }">
+                  <el-button type="primary" link @click="handleDelete($index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </byForm>
+      <template #footer>
+        <el-button @click="dialogVisible = false" size="large">取 消</el-button>
+        <el-button type="primary" @click="submitForm()" size="large">确 定</el-button>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="openProduct" title="选择商品" width="70%" append-to-body>
+      <SelectGoods @cancel="openProduct = false" @pushGoods="pushGoods"></SelectGoods>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { computed, ref } from "vue";
+import byTable from "@/components/byTable/index";
+import byForm from "@/components/byForm/index";
+import { ElMessage } from "element-plus";
+import SelectGoods from "@/components/product/SelectGoods";
+
+const { proxy } = getCurrentInstance();
+const warehouseList = ref([]);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 0,
+    pageNum: 1,
+    pageSize: 10,
+    keyword: "",
+    type: "3",
+  },
+});
+const loading = ref(false);
+const selectConfig = computed(() => {
+  return [
+    {
+      label: "调出仓库",
+      prop: "warehouseId",
+      data: warehouseList.value,
+    },
+    {
+      label: "调入仓库",
+      prop: "toWarehouseId",
+      data: warehouseList.value,
+    },
+  ];
+});
+const config = computed(() => {
+  return [
+    {
+      attrs: {
+        label: "单号",
+        prop: "code",
+        width: 160,
+      },
+    },
+    {
+      attrs: {
+        label: "调出仓库",
+        prop: "warehouseId",
+        width: 220,
+      },
+      render(type) {
+        return proxy.dictValueLabel(type, warehouseList.value);
+      },
+    },
+    {
+      attrs: {
+        label: "调出仓库",
+        prop: "toWarehouseId",
+        width: 220,
+      },
+      render(type) {
+        return proxy.dictValueLabel(type, warehouseList.value);
+      },
+    },
+    {
+      attrs: {
+        label: "物品编码",
+        prop: "productCode",
+        width: 160,
+      },
+    },
+    {
+      attrs: {
+        label: "物品名称",
+        slot: "productName",
+        "min-width": 220,
+      },
+    },
+    {
+      attrs: {
+        label: "规格型号",
+        prop: "productModel",
+        width: 160,
+      },
+    },
+    {
+      attrs: {
+        label: "单位",
+        prop: "unit",
+        width: 120,
+      },
+    },
+    {
+      attrs: {
+        label: "调仓数量",
+        prop: "quantity",
+        width: 140,
+      },
+    },
+    {
+      attrs: {
+        label: "操作人",
+        prop: "userName",
+        width: 140,
+      },
+    },
+    {
+      attrs: {
+        label: "操作时间",
+        prop: "createTime",
+        width: 160,
+      },
+    },
+  ];
+});
+const getDict = () => {
+  proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      warehouseList.value = res.rows.map((item) => {
+        return {
+          label: item.name,
+          value: item.id,
+        };
+      });
+    }
+  });
+};
+const getList = async (req) => {
+  sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  loading.value = true;
+  proxy.post("/stockJournal/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
+};
+getDict();
+getList();
+const dialogVisible = ref(false);
+const loadingDialog = ref(false);
+const submit = ref(null);
+const openProduct = ref(false);
+const formOption = reactive({
+  inline: true,
+  labelWidth: 100,
+  itemWidth: 100,
+  rules: [],
+});
+const formData = reactive({
+  data: {},
+});
+const formConfig = computed(() => {
+  return [
+    {
+      label: "基本信息",
+    },
+    {
+      type: "select",
+      prop: "warehouseId",
+      label: "调出仓库",
+      required: true,
+      data: warehouseList.value,
+      itemWidth: 30,
+    },
+    {
+      type: "select",
+      prop: "toWarehouseId",
+      label: "调入仓库",
+      required: true,
+      data: warehouseList.value,
+      itemWidth: 30,
+    },
+    {
+      type: "input",
+      prop: "remark",
+      label: "调仓说明",
+      itemType: "textarea",
+    },
+    {
+      type: "slot",
+      slotName: "details",
+      label: "入库明细",
+    },
+  ];
+});
+const rules = ref({
+  warehouseId: [{ required: true, message: "请选择仓库", trigger: "change" }],
+});
+const openModal = () => {
+  formData.data = {
+    type: "1",
+    list: [],
+  };
+  loadingDialog.value = false;
+  dialogVisible.value = true;
+};
+const pushGoods = (goods) => {
+  if (goods && goods.length > 0) {
+    formData.data.list = formData.data.list.concat(
+      goods.map((item) => {
+        return {
+          code: item.code,
+          productId: item.id,
+          productName: item.name,
+          productModel: item.spec,
+          unit: item.unit,
+          quantity: undefined,
+        };
+      })
+    );
+    ElMessage({
+      message: "添加成功!",
+      type: "success",
+    });
+    openProduct.value = false;
+  } else {
+    ElMessage("请选择至少一件产品");
+  }
+};
+const submitForm = () => {
+  submit.value.handleSubmit(() => {
+    loadingDialog.value = true;
+    proxy.post("/stock/stockTransfer", formData.data).then(
+      () => {
+        ElMessage({
+          message: "提交成功",
+          type: "success",
+        });
+        dialogVisible.value = false;
+        getList();
+      },
+      (err) => {
+        console.log(err);
+        loadingDialog.value = false;
+      }
+    );
+  });
+};
+const handleDelete = (index) => {
+  formData.data.list.splice(index, 1);
+};
+</script>
+
+<style lang="scss" scoped>
+.tenant {
+  padding: 20px;
+}
+::v-deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
+</style>