异常管理静态页面

src/components/process/ReturnGood.vue

@@ -16,16 +16,15 @@
           >
             添加物品
           </el-button>
-          <el-table :data="formData.data.purchaseDetailList">
+          <el-table :data="formData.data.salesReturnDetailList">
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productName" label="货品名称" />
             <el-table-column prop="productSpec" label="规格型号" />
             <el-table-column prop="productUnit" label="单位" />
-
             <el-table-column prop="count" label="退货数量" min-width="150">
               <template #default="{ row, $index }">
                 <el-form-item
-                  :prop="'purchaseDetailList.' + $index + '.count'"
+                  :prop="'salesReturnDetailList.' + $index + '.count'"
                   :rules="rules.count"
                   :inline-message="true"
                 >
@@ -41,7 +40,7 @@
             <el-table-column prop="remark" label="退货原因" min-width="150">
               <template #default="{ row, $index }">
                 <el-form-item
-                  :prop="'purchaseDetailList.' + $index + '.remark'"
+                  :prop="'salesReturnDetailList.' + $index + '.remark'"
                   :rules="rules.remark"
                   :inline-message="true"
                 >
@@ -76,17 +75,22 @@
 
 <script setup>
 import byForm from "@/components/byForm/index";
+import { ElMessage, ElMessageBox } from "element-plus";
 import SelectGoods from "@/components/product/SelectGoods";
+import useUserStore from "@/store/modules/user";
+const { proxy } = getCurrentInstance();
 
 let formData = reactive({
   data: {
     supplyId: "",
-    purchaseDetailList: [],
+    salesReturnDetailList: [],
     returnName: "",
   },
 });
 let rules = ref({
   supplyId: [{ required: true, message: "请选择供应商", trigger: "change" }],
+  count: [{ required: true, message: "请输入退货数量", trigger: "blur" }],
+  remark: [{ required: true, message: "请输入退货原因", trigger: "blur" }],
 });
 const formOption = reactive({
   inline: true,
@@ -97,7 +101,7 @@ const formConfig = computed(() => {
   return [
     {
       type: "input",
-      prop: "name",
+      prop: "returnDept",
       label: "申请部门",
       itemWidth: 25,
       disabled: true,
@@ -107,7 +111,7 @@ const formConfig = computed(() => {
     },
     {
       type: "input",
-      prop: "name",
+      prop: "returnName",
       label: "申请人",
       itemWidth: 25,
       disabled: true,
@@ -117,7 +121,7 @@ const formConfig = computed(() => {
     },
     {
       type: "date",
-      prop: "name",
+      prop: "purchaseTime",
       label: "申请时间",
       itemWidth: 25,
       disabled: true,
@@ -150,12 +154,32 @@ const formConfig = computed(() => {
 });
 const formDom = ref(null);
 const handleSubmit = async () => {
-  const vaild = await formDom.value.handleSubmit(() => {});
-  console.log(vaild, "wqsds");
+  const vaild = await formDom.value.handleSubmit(() => {}); //拿到内部表单是否验证通过
+  if (vaild) {
+    if (formData.data.salesReturnDetailList.length > 0) {
+      const list = formData.data.salesReturnDetailList;
+      for (let i = 0; i < list.length; i++) {
+        const e = list[i];
+        if (e.count == 0) {
+          ElMessage({
+            message: "退货数量不能为0！",
+            type: "info",
+          });
+          return false;
+        }
+      }
+      return true;
+    }
+    ElMessage({
+      message: "请添加退货明细！",
+      type: "info",
+    });
+    return false;
+  }
 };
 let openProduct = ref(false);
 const handleRemove = (index) => {
-  formData.data.purchaseDetailList.splice(index, 1);
+  formData.data.salesReturnDetailList.splice(index, 1);
   return ElMessage({
     message: "删除成功！",
     type: "success",
@@ -169,12 +193,11 @@ const pushGoods = (goods) => {
     productSpec: x.spec,
     productUnit: x.unit,
     count: 0,
-    price: 0,
     bussinessId: x.id,
-    amount: 0,
+    remark: "",
   }));
-  formData.data.purchaseDetailList =
-    formData.data.purchaseDetailList.concat(arr);
+  formData.data.salesReturnDetailList =
+    formData.data.salesReturnDetailList.concat(arr);
   return ElMessage({
     message: "添加成功！",
     type: "success",
@@ -186,6 +209,13 @@ const props = defineProps({
   queryData: String,
 });
 
+// 获取用户信息并赋默认值
+const userInfo = useUserStore().user;
+onMounted(() => {
+  formData.data.purchaseTime = proxy.parseTime(new Date());
+  formData.data.returnDept = userInfo.dept.deptName;
+  formData.data.returnName = userInfo.nickName;
+});
 // 向父组件暴露
 defineExpose({
   submitData: formData.data,

src/views/WDLY/basic/product/index.vue

@@ -309,6 +309,24 @@ const selectConfig = computed(() => {
         },
       ],
     },
+    {
+      label: "生命周期",
+      prop: "lifeCycle",
+      data: [
+        {
+          label: "新品",
+          value: "1",
+        },
+        {
+          label: "成长",
+          value: "2",
+        },
+        {
+          label: "成熟",
+          value: "3",
+        },
+      ],
+    },
   ];
 });
 const config = computed(() => {
@@ -355,6 +373,38 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "管理部门",
+        prop: "spec",
+      },
+    },
+    {
+      attrs: {
+        label: "生命周期",
+        prop: "spec",
+      },
+    },
+
+    {
+      attrs: {
+        label: "京东供价",
+        prop: "spec",
+      },
+    },
+    {
+      attrs: {
+        label: "标准售价",
+        prop: "spec",
+      },
+    },
+    {
+      attrs: {
+        label: "标准采购价",
+        prop: "spec",
+      },
+    },
+
+    {
+      attrs: {
         label: "产品备注",
         prop: "remark",
       },
@@ -698,6 +748,9 @@ const getDtl = (row) => {
     res.type = res.type + ""; //type回显
     res.definition = "1"; //产品
     res.victoriatouristJson = JSON.parse(res.victoriatouristJson);
+    console.log(res.victoriatouristJson, "ws");
+    res.combination = res.victoriatouristJson.combination + "";
+    res.productCombinationList = res.victoriatouristJson.productCombinationList;
     formData.data = res;
     dialogVisible.value = true;
   });

src/views/WDLY/outInBound/abnormal/index.vue

@@ -0,0 +1,301 @@
+<template>
+  <div class="tenant">
+    <!-- <Banner /> -->
+    <div class="content">
+      <byTable
+        :source="sourceList.data"
+        :pagination="sourceList.pagination"
+        :config="config"
+        :loading="loading"
+        highlight-current-row
+        :selectConfig="selectConfig"
+        :table-events="{
+          //element talbe事件都能传
+          select: select,
+        }"
+        :action-list="[]"
+        @get-list="getList"
+      >
+        <template #slotName="{ item }">
+          {{ item.createTime }}
+        </template>
+      </byTable>
+    </div>
+    <el-dialog
+      :title="modalType == 'add' ? '添加仓库' : '编辑'"
+      v-model="dialogVisible"
+      width="800"
+      v-loading="loading"
+    >
+      <byForm
+        :formConfig="formConfig"
+        :formOption="formOption"
+        v-model="formData.data"
+        :rules="rules"
+        ref="byform"
+      >
+      </byForm>
+      <template #footer>
+        <el-button @click="dialogVisible = false" size="large">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="submitForm('byform')"
+          size="large"
+          :loading="submitLoading"
+        >
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+  
+<script setup>
+/* eslint-disable vue/no-unused-components */
+import { ElMessage, ElMessageBox } from "element-plus";
+import byTable from "@/components/byTable/index";
+import byForm from "@/components/byForm/index";
+import { computed, defineComponent, ref } from "vue";
+import useUserStore from "@/store/modules/user";
+
+const loading = ref(false);
+const submitLoading = ref(false);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 3,
+    pageNum: 1,
+    pageSize: 10,
+  },
+});
+let dialogVisible = ref(false);
+let roomDialogVisible = ref(false);
+let modalType = ref("add");
+let rules = ref({
+  type: [
+    { required: true, message: "请选择仓库类型", trigger: ["blur", "change"] },
+  ],
+  name: [{ required: true, message: "请输入仓库名称", trigger: "blur" }],
+});
+const { proxy } = getCurrentInstance();
+const selectConfig = reactive([
+  {
+    label: "异常来源",
+    prop: "type",
+    data: [],
+  },
+  {
+    label: "处理状态",
+    prop: "type",
+    data: [],
+  },
+]);
+
+const config = computed(() => {
+  return [
+    {
+      attrs: {
+        label: "异常来源",
+        prop: "name",
+      },
+      render(type) {
+        return proxy.dictDataEcho(type, warehouseType.value);
+      },
+    },
+    {
+      attrs: {
+        label: "异常说明",
+        prop: "type",
+      },
+    },
+    {
+      attrs: {
+        label: "处理状态",
+        prop: "name",
+      },
+      render(type) {
+        return proxy.dictDataEcho(type, warehouseType.value);
+      },
+    },
+    {
+      attrs: {
+        label: "最近操作人",
+        prop: "keeperName",
+      },
+    },
+    {
+      attrs: {
+        label: "最近操作时间",
+        prop: "remark",
+      },
+    },
+
+    {
+      attrs: {
+        label: "操作",
+        width: "200",
+        align: "right",
+      },
+      // 渲染 el-button，一般用在最后一列。
+      renderHTML(row) {
+        return [
+          {
+            attrs: {
+              label: "跟进",
+              type: "primary",
+              text: true,
+            },
+            el: "button",
+            click() {
+              getDtl(row);
+            },
+          },
+          {
+            attrs: {
+              label: "查看关联",
+              type: "primary",
+              text: true,
+            },
+            el: "button",
+            click() {},
+          },
+          {
+            attrs: {
+              label: "跟进记录",
+              type: "primary",
+              text: true,
+            },
+            el: "button",
+            click() {},
+          },
+        ];
+      },
+    },
+  ];
+});
+
+let formData = reactive({
+  data: {},
+  treeData: [],
+});
+const formOption = reactive({
+  inline: true,
+  labelWidth: 100,
+  itemWidth: 100,
+  rules: [],
+});
+const byform = ref(null);
+const treeData = ref([]);
+const formConfig = reactive([
+  {
+    type: "select",
+    prop: "type",
+    label: "仓库类型",
+    required: true,
+    data: [],
+  },
+  {
+    type: "input",
+    prop: "name",
+    label: "仓库名称",
+  },
+  {
+    type: "select",
+    prop: "keeperId",
+    label: "仓管员",
+    isLoad: {
+      url: `/tenantUser/list?pageNum=1&pageSize=9999&tenantId=${
+        useUserStore().user.tenantId
+      }`,
+      labelKey: "nickName",
+      labelVal: "userId",
+      method: "get",
+      resUrl: "rows",
+    },
+  },
+  {
+    type: "input",
+    itemType: "textarea",
+    prop: "remark",
+    label: "备注",
+  },
+]);
+const getList = async (req) => {
+  sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  loading.value = true;
+  proxy
+    .post("/abnormalInfo/page", sourceList.value.pagination)
+    .then((message) => {
+      console.log(message);
+      sourceList.value.data = message.rows;
+      sourceList.value.pagination.total = message.total;
+      setTimeout(() => {
+        loading.value = false;
+      }, 200);
+    });
+};
+const openModal = () => {
+  dialogVisible.value = true;
+  modalType.value = "add";
+  formData.data = {};
+};
+
+const submitForm = () => {
+  console.log(byform.value);
+  byform.value.handleSubmit((valid) => {
+    submitLoading.value = true;
+    proxy.post("/warehouse/" + modalType.value, formData.data).then(
+      (res) => {
+        ElMessage({
+          message: modalType.value == "add" ? "添加成功" : "编辑成功",
+          type: "success",
+        });
+        dialogVisible.value = false;
+        submitLoading.value = false;
+        getList();
+      },
+      (err) => (submitLoading.value = false)
+    );
+  });
+};
+
+const getDtl = (row) => {
+  modalType.value = "edit";
+  proxy.post("/warehouse/detail", { id: row.id }).then((res) => {
+    res.type = res.type + "";
+    formData.data = res;
+    console.log(formData);
+    dialogVisible.value = true;
+  });
+};
+const warehouseType = ref([]);
+const getDict = () => {
+  // // 币种数据
+  proxy
+    .post("/dictTenantData/page", {
+      pageNum: 1,
+      pageSize: 999,
+      tenantId: useUserStore().user.tenantId,
+      dictCode: "warehouse_type",
+    })
+    .then((res) => {
+      warehouseType.value = res.rows;
+      selectConfig[0].data = res.rows.map((x) => ({
+        label: x.dictValue,
+        value: x.dictKey,
+      }));
+      formConfig[0].data = res.rows.map((x) => ({
+        label: x.dictValue,
+        value: x.dictKey,
+      }));
+    });
+};
+getList();
+getDict();
+</script>
+  
+<style lang="scss" scoped>
+.tenant {
+  padding: 20px;
+}
+</style>

src/views/process/processApproval/index.vue

@@ -263,8 +263,19 @@ const handleSubmit = async () => {
               handleResult(res);
             });
           } else if (queryData.data.isSubscribe == "30") {
+            proxy
+              .post("/flowProcess/initiate", {
+                ...flowForm,
+                flowKey: "account_request_funds_flow",
+                data,
+              })
+              .then((res) => {
+                console.log(res, "awss");
+                handleResult(res);
+              });
+          } else if (queryData.data.isSubscribe == "40") {
             console.log(data, "wssaa");
-            proxy.post("/accountRequestFunds/start", data).then((res) => {
+            proxy.post("/flowProcess/initiate", data).then((res) => {
               handleResult(res);
             });
           }